diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp index 428ceb43b..bc53e3cd7 100644 --- a/src/game/Server/Opcodes.cpp +++ b/src/game/Server/Opcodes.cpp @@ -257,8 +257,8 @@ void InitializeOpcodes() OPCODE(MSG_MOVE_START_FORWARD, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(MSG_MOVE_START_BACKWARD, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(CMSG_MOVE_STOP, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); - OPCODE(CMSG_MOVE_START_STRAFE_LEFT, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); - OPCODE(CMSG_MOVE_START_STRAFE_RIGHT, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); + OPCODE(MSG_MOVE_START_STRAFE_LEFT, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); + OPCODE(MSG_MOVE_START_STRAFE_RIGHT, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(CMSG_MOVE_STOP_STRAFE, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(MSG_MOVE_JUMP, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(CMSG_MOVE_START_TURN_LEFT, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h index 51dae443e..cb3698388 100644 --- a/src/game/Server/Opcodes.h +++ b/src/game/Server/Opcodes.h @@ -250,8 +250,8 @@ enum Opcodes MSG_MOVE_START_FORWARD = 0x095A, // 5.4.8 18414 MSG_MOVE_START_BACKWARD = 0x09D8, // 5.4.8 18414 CMSG_MOVE_STOP = 0x0649, // 5.4.1 17538 - CMSG_MOVE_START_STRAFE_LEFT = 0x0EC8, // 5.4.1 17538 - CMSG_MOVE_START_STRAFE_RIGHT = 0x0269, // 5.4.1 17538 + MSG_MOVE_START_STRAFE_LEFT = 0x01F8, // 5.4.8 18414 + MSG_MOVE_START_STRAFE_RIGHT = 0x1058, // 5.4.8 18414 CMSG_MOVE_STOP_STRAFE = 0x12C9, // 5.4.1 17538 MSG_MOVE_JUMP = 0x1153, // 5.4.8 18414 CMSG_MOVE_START_TURN_LEFT = 0x0760, // 5.4.1 17538 diff --git a/src/game/movement/MovementStructures.h b/src/game/movement/MovementStructures.h index 25655f8f4..60846f38a 100644 --- a/src/game/movement/MovementStructures.h +++ b/src/game/movement/MovementStructures.h @@ -709,73 +709,77 @@ MovementStatusElements MovementStartForwardSequence[] = MovementStatusElements MovementStartStrafeLeftSequence[] = { + MSEPositionY, MSEPositionZ, MSEPositionX, - MSEPositionY, - MSEHasSplineElevation, - MSEGuidBit5, - MSEHasPitch, - MSEGuidBit6, - MSEHasTimestamp, - MSEGuidBit1, - MSEHasUnknownBit, - MSEGuidBit4, MSEGuidBit0, - MSEGuidBit2, - MSEHasFallData, - MSEHasOrientation, + MSEHasTimestamp, MSEGuidBit3, MSEHasMovementFlags2, - MSEGuidBit7, - MSEHasSpline, - MSEHasMovementFlags, + MSEHasPitch, + MSEHasUnknownBit, + MSEGuidBit2, + MSEHasUnknownBit, MSEHasTransportData, - MSEHasFallDirection, - MSEHasTransportTime2, - MSETransportGuidBit7, - MSEHasTransportTime3, - MSETransportGuidBit3, + MSEHasFallData, + MSEGuidBit5, + MSECounterCount, + MSEHasUnknownBit, + MSEGuidBit4, + MSEHasOrientation, + MSEHasSplineElevation, + MSEGuidBit7, + MSEHasUnkTime, + MSEGuidBit1, + MSEGuidBit6, + MSEHasMovementFlags, + MSETransportGuidBit0, + MSETransportGuidBit2, MSETransportGuidBit1, MSETransportGuidBit6, + MSETransportGuidBit7, + MSETransportGuidBit3, MSETransportGuidBit5, - MSETransportGuidBit2, + MSEHasTransportTime3, + MSEHasTransportTime2, MSETransportGuidBit4, - MSETransportGuidBit0, MSEFlags, + MSEHasFallDirection, MSEFlags2, - MSEGuidByte2, - MSEGuidByte6, - MSEGuidByte3, - MSEGuidByte1, MSEGuidByte0, + MSEGuidByte2, + MSEMovementCounter, + MSEGuidByte3, + MSEGuidByte5, + MSEGuidByte1, MSEGuidByte7, MSEGuidByte4, - MSEGuidByte5, - MSEFallSinAngle, - MSEFallHorizontalSpeed, - MSEFallCosAngle, - MSEFallTime, - MSEFallVerticalSpeed, - MSETransportSeat, + MSEGuidByte6, MSETransportGuidByte2, - MSETransportTime2, - MSETransportGuidByte3, MSETransportPositionZ, MSETransportTime3, + MSETransportGuidByte6, + MSETransportGuidByte3, + MSETransportPositionO, + MSETransportGuidByte5, + MSETransportTime2, + MSETransportGuidByte1, + MSETransportPositionY, + MSETransportGuidByte4, + MSETransportTime, + MSETransportPositionX, MSETransportGuidByte0, MSETransportGuidByte7, - MSETransportPositionY, - MSETransportGuidByte5, - MSETransportGuidByte1, - MSETransportPositionO, - MSETransportTime, - MSETransportGuidByte6, - MSETransportGuidByte4, - MSETransportPositionX, - MSETimestamp, - MSEPositionO, MSEPitch, + MSETimestamp, + MSEFallTime, + MSEFallCosAngle, + MSEFallHorizontalSpeed, + MSEFallSinAngle, + MSEFallVerticalSpeed, + MSEUnkTime, MSESplineElevation, + MSEPositionO, MSEEnd, }; @@ -784,69 +788,73 @@ MovementStatusElements MovementStartStrafeRightSequence[] = MSEPositionY, MSEPositionX, MSEPositionZ, - MSEHasPitch, - MSEGuidBit1, - MSEHasOrientation, - MSEGuidBit4, - MSEHasSpline, - MSEHasUnknownBit, - MSEGuidBit5, + MSEGuidBit0, MSEHasFallData, - MSEHasSplineElevation, - MSEHasTimestamp, - MSEHasMovementFlags, - MSEGuidBit2, + MSECounterCount, MSEGuidBit7, MSEGuidBit6, + MSEGuidBit4, + MSEHasMovementFlags, + MSEGuidBit5, + MSEHasSplineElevation, MSEGuidBit3, + MSEHasUnknownBit, + MSEHasTransportData, + MSEHasUnkTime, + MSEGuidBit1, + MSEHasUnknownBit, + MSEGuidBit2, + MSEHasPitch, MSEHasMovementFlags2, - MSEHasTransportData, - MSEGuidBit0, - MSETransportGuidBit7, - MSETransportGuidBit2, + MSEHasOrientation, + MSEHasUnknownBit, + MSEHasTimestamp, + MSEHasFallDirection, + MSETransportGuidBit1, + MSETransportGuidBit6, MSETransportGuidBit3, MSETransportGuidBit5, + MSETransportGuidBit2, MSETransportGuidBit0, - MSEHasTransportTime2, - MSETransportGuidBit6, - MSETransportGuidBit1, MSETransportGuidBit4, MSEHasTransportTime3, - MSEFlags2, + MSETransportGuidBit7, + MSEHasTransportTime2, MSEFlags, - MSEHasFallDirection, - MSEGuidByte7, - MSEGuidByte5, - MSEGuidByte3, - MSEGuidByte1, - MSEGuidByte2, - MSEGuidByte4, + MSEFlags2, MSEGuidByte6, + MSEGuidByte7, MSEGuidByte0, - MSETransportGuidByte5, - MSETransportGuidByte1, - MSETransportGuidByte6, - MSETransportPositionY, - MSETransportPositionO, - MSETransportGuidByte0, - MSETransportGuidByte2, - MSETransportSeat, - MSETransportPositionX, - MSETransportTime3, - MSETransportTime, - MSETransportGuidByte4, - MSETransportGuidByte7, - MSETransportTime2, - MSETransportPositionZ, - MSETransportGuidByte3, + MSEGuidByte4, + MSEGuidByte1, + MSEMovementCounter, + MSEGuidByte2, + MSEGuidByte3, + MSEGuidByte5, MSEPitch, - MSEPositionO, - MSEFallCosAngle, - MSEFallSinAngle, - MSEFallHorizontalSpeed, - MSEFallTime, - MSEFallVerticalSpeed, + MSETransportGuidByte1, + MSETransportGuidByte3, + MSETransportTime2, + MSETransportGuidByte7, + MSETransportTime3, + MSETransportGuidByte5, + MSETransportGuidByte6, + MSETransportGuidByte2, + MSETransportGuidByte0, + MSETransportTime, + MSETransportPositionO, + MSETransportPositionY, + MSETransportPositionZ, + MSETransportGuidByte4, + MSETransportPositionX, MSETimestamp, + MSEFallVerticalSpeed, + MSEFallCosAngle, + MSEFallHorizontalSpeed, + MSEFallSinAngle, + MSEFallTime, + MSEPositionO, + MSEUnkTime, MSESplineElevation, MSEEnd, }; @@ -2603,15 +2611,15 @@ MovementStatusElements* GetMovementStatusElementsSequence(uint16 opcode) return MovementCastSpellSequence; case CMSG_MOVE_CHNG_TRANSPORT: return MovementChngTransportSequence; - case MSG_MOVE_FALL_LAND: + case MSG_MOVE_FALL_LAND: // 5.4.8 return MovementFallLandSequence; case CMSG_MOVE_FALL_RESET: return MovementFallResetSequence; - case MSG_MOVE_JUMP: + case MSG_MOVE_JUMP: // 5.4.8 return MovementJumpSequence; case CMSG_MOVE_SET_CAN_FLY_ACK: return MovementSetCanFlyAckSequence; - case MSG_MOVE_SET_FACING: + case MSG_MOVE_SET_FACING: // 5.4.8 return MovementSetFacingSequence; case CMSG_MOVE_SET_PITCH: return MovementSetPitchSequence; @@ -2621,13 +2629,13 @@ MovementStatusElements* GetMovementStatusElementsSequence(uint16 opcode) return MovementSetWalkModeSequence; case CMSG_MOVE_SPLINE_DONE: return MovementSplineDoneSequence; - case MSG_MOVE_START_BACKWARD: + case MSG_MOVE_START_BACKWARD: // 5.4.8 return MovementStartBackwardSequence; - case MSG_MOVE_START_FORWARD: + case MSG_MOVE_START_FORWARD: // 5.4.8 return MovementStartForwardSequence; - case CMSG_MOVE_START_STRAFE_LEFT: + case MSG_MOVE_START_STRAFE_LEFT: // 5.4.8 return MovementStartStrafeLeftSequence; - case CMSG_MOVE_START_STRAFE_RIGHT: + case MSG_MOVE_START_STRAFE_RIGHT: // 5.4.8 return MovementStartStrafeRightSequence; case CMSG_MOVE_START_TURN_LEFT: return MovementStartTurnLeftSequence; @@ -2655,9 +2663,9 @@ MovementStatusElements* GetMovementStatusElementsSequence(uint16 opcode) return MovementStartPitchUpSequence; case CMSG_MOVE_STOP_PITCH: return MovementStopPitchSequence; - case MSG_MOVE_HEARTBEAT: + case MSG_MOVE_HEARTBEAT: // 5.4.8 return MovementHeartBeatSequence; - case SMSG_PLAYER_MOVE: + case SMSG_PLAYER_MOVE: // 5.4.8 return PlayerMoveSequence; case CMSG_MOVE_KNOCK_BACK_ACK: return MoveKnockbackAckSequence;