diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp index 06ef4a73b..13d6169d5 100644 --- a/src/game/Server/Opcodes.cpp +++ b/src/game/Server/Opcodes.cpp @@ -256,14 +256,14 @@ void InitializeOpcodes() OPCODE(CMSG_AREATRIGGER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAreaTriggerOpcode ); 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(MSG_MOVE_STOP, 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_STOP_STRAFE, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(MSG_MOVE_JUMP, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(MSG_MOVE_START_TURN_LEFT, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(MSG_MOVE_START_TURN_RIGHT, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); - OPCODE(CMSG_MOVE_STOP_TURN, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); + OPCODE(MSG_MOVE_STOP_TURN, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(CMSG_MOVE_START_PITCH_UP, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(CMSG_MOVE_START_PITCH_DOWN, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(CMSG_MOVE_STOP_PITCH, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h index 1a9756c51..11eab269a 100644 --- a/src/game/Server/Opcodes.h +++ b/src/game/Server/Opcodes.h @@ -249,14 +249,14 @@ enum Opcodes CMSG_AREATRIGGER = 0x155A, // 5.4.7 18019 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 + MSG_MOVE_STOP = 0x08F1, // 5.4.8 18414 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_STOP_STRAFE = 0x0171, // 5.4.8 18414 MSG_MOVE_JUMP = 0x1153, // 5.4.8 18414 MSG_MOVE_START_TURN_LEFT = 0x01D0, // 5.4.8 18414 MSG_MOVE_START_TURN_RIGHT = 0x107B, // 5.4.8 18414 - CMSG_MOVE_STOP_TURN = 0x1749, // 5.4.1 17538 + MSG_MOVE_STOP_TURN = 0x1170, // 5.4.8 18414 CMSG_MOVE_START_PITCH_UP = 0x0FE1, // 5.4.1 17538 CMSG_MOVE_START_PITCH_DOWN = 0x16E8, // 5.4.1 17538 CMSG_MOVE_STOP_PITCH = 0x1A48, // 5.4.1 17538 diff --git a/src/game/movement/MovementStructures.h b/src/game/movement/MovementStructures.h index 4dd018f7e..0095499df 100644 --- a/src/game/movement/MovementStructures.h +++ b/src/game/movement/MovementStructures.h @@ -799,7 +799,7 @@ MovementStatusElements MovementStartStrafeRightSequence[] = MSEHasSplineElevation, MSEGuidBit3, MSEHasUnknownBit, - MSEHasTransportData, + MSEHasTransportData, MSEHasUnkTime, MSEGuidBit1, MSEHasUnknownBit, @@ -1016,142 +1016,149 @@ MovementStatusElements MovementStopSequence[] = MSEPositionX, MSEPositionY, MSEPositionZ, - MSEGuidBit3, - MSEGuidBit6, - MSEHasSplineElevation, - MSEHasSpline, - MSEHasOrientation, - MSEGuidBit7, - MSEHasMovementFlags, MSEGuidBit5, - MSEHasFallData, - MSEHasMovementFlags2, - MSEHasTransportData, - MSEHasTimestamp, - MSEGuidBit4, - MSEGuidBit1, - MSEHasUnknownBit, MSEGuidBit2, + MSEHasFallData, MSEGuidBit0, + MSEHasUnknownBit, + MSEHasUnknownBit, + MSEHasUnkTime, + MSEGuidBit1, + MSECounterCount, MSEHasPitch, + MSEGuidBit3, + MSEGuidBit4, + MSEHasTransportData, + MSEHasUnknownBit, + MSEGuidBit6, + MSEHasMovementFlags, + MSEHasTimestamp, + MSEHasMovementFlags2, + MSEHasOrientation, + MSEHasSplineElevation, + MSEGuidBit7, + MSEHasTransportTime2, MSETransportGuidBit7, MSETransportGuidBit4, MSETransportGuidBit1, - MSETransportGuidBit5, - MSEHasTransportTime2, - MSEHasTransportTime3, - MSETransportGuidBit3, - MSETransportGuidBit6, MSETransportGuidBit0, + MSETransportGuidBit5, MSETransportGuidBit2, - MSEFlags, + MSETransportGuidBit3, + MSEHasTransportTime3, + MSETransportGuidBit6, MSEFlags2, - MSEHasFallDirection, - MSEGuidByte6, - MSEGuidByte3, + MSEFlags, MSEGuidByte0, + MSEGuidByte3, + MSEMovementCounter, + MSEGuidByte6, + MSEGuidByte1, MSEGuidByte4, MSEGuidByte2, - MSEGuidByte1, MSEGuidByte5, MSEGuidByte7, - MSETransportGuidByte4, - MSETransportGuidByte7, - MSETransportTime, - MSETransportSeat, - MSETransportPositionZ, - MSETransportTime3, - MSETransportGuidByte2, - MSETransportGuidByte0, - MSETransportPositionY, - MSETransportGuidByte1, - MSETransportGuidByte3, - MSETransportTime2, - MSETransportPositionX, - MSETransportPositionO, - MSETransportGuidByte5, - MSETransportGuidByte6, - MSETimestamp, MSEPositionO, - MSEPitch, - MSESplineElevation, - MSEFallCosAngle, - MSEFallSinAngle, - MSEFallHorizontalSpeed, MSEFallVerticalSpeed, + MSEFallHorizontalSpeed, + MSEFallSinAngle, + MSEFallCosAngle, MSEFallTime, + MSESplineElevation, + MSETransportPositionX, + MSETransportTime, + MSETransportGuidByte3, + MSETransportPositionO, + MSETransportPositionY, + MSETransportGuidByte2, + MSETransportGuidByte6, + MSETransportGuidByte7, + MSETransportGuidByte1, + MSETransportGuidByte4, + MSETransportTime3, + MSETransportGuidByte0, + MSETransportPositionZ, + MSETransportGuidByte5, + MSETransportTime2, + MSEUnkTime, + MSEPitch, + MSETimestamp, MSEEnd, }; MovementStatusElements MovementStopStrafeSequence[] = { - MSEPositionY, MSEPositionZ, MSEPositionX, - MSEHasPitch, - MSEHasTimestamp, - MSEGuidBit2, + MSEPositionY, MSEHasFallData, - MSEGuidBit7, - MSEHasSplineElevation, - MSEGuidBit3, MSEHasOrientation, - MSEHasMovementFlags2, - MSEHasTransportData, + MSEHasSplineElevation, + MSEHasTimestamp, MSEHasMovementFlags, - MSEHasSpline, + MSEHasUnkTime, + MSEGuidBit6, + MSEHasTransportData, + MSEHasUnknownBit, + MSEHasMovementFlags2, + MSEGuidBit4, + MSEHasPitch, + MSEGuidBit5, + MSEGuidBit3, + MSEGuidBit2, + MSECounterCount, + MSEHasUnknownBit, + MSEGuidBit7, MSEGuidBit0, MSEHasUnknownBit, - MSEGuidBit6, - MSEGuidBit5, MSEGuidBit1, - MSEGuidBit4, MSETransportGuidBit7, - MSETransportGuidBit0, - MSETransportGuidBit4, - MSETransportGuidBit2, - MSETransportGuidBit6, - MSETransportGuidBit5, - MSEHasTransportTime2, - MSETransportGuidBit1, - MSETransportGuidBit3, MSEHasTransportTime3, - MSEFlags, - MSEHasFallDirection, + MSETransportGuidBit3, + MSETransportGuidBit1, + MSETransportGuidBit6, + MSEHasTransportTime2, + MSETransportGuidBit2, + MSETransportGuidBit5, + MSETransportGuidBit4, + MSETransportGuidBit0, MSEFlags2, - MSEGuidByte2, - MSEGuidByte7, - MSEGuidByte3, - MSEGuidByte4, + MSEHasFallDirection, + MSEFlags, MSEGuidByte5, - MSEGuidByte6, - MSEGuidByte1, + MSEGuidByte3, + MSEMovementCounter, + MSEGuidByte2, MSEGuidByte0, - MSETransportSeat, - MSETransportGuidByte6, - MSETransportPositionZ, + MSEGuidByte1, + MSEGuidByte6, + MSEGuidByte4, + MSEGuidByte7, + MSETransportGuidByte0, MSETransportTime3, MSETransportGuidByte1, - MSETransportGuidByte3, - MSETransportGuidByte2, - MSETransportGuidByte4, - MSETransportGuidByte5, + MSETransportGuidByte6, MSETransportTime, - MSETransportPositionO, - MSETransportPositionX, - MSETransportGuidByte0, MSETransportPositionY, + MSETransportPositionZ, + MSETransportGuidByte4, MSETransportTime2, + MSETransportGuidByte3, + MSETransportPositionX, + MSETransportGuidByte2, MSETransportGuidByte7, + MSETransportGuidByte5, + MSETransportPositionO, + MSEPositionO, + MSESplineElevation, + MSETimestamp, MSEFallCosAngle, - MSEFallHorizontalSpeed, MSEFallSinAngle, + MSEFallHorizontalSpeed, MSEFallTime, MSEFallVerticalSpeed, - MSESplineElevation, - MSEPositionO, MSEPitch, - MSETimestamp, + MSEUnkTime, MSEEnd, }; @@ -1160,70 +1167,74 @@ MovementStatusElements MovementStopTurnSequence[] = MSEPositionX, MSEPositionZ, MSEPositionY, - MSEGuidBit5, - MSEGuidBit4, - MSEHasFallData, + MSEHasTransportData, + MSECounterCount, MSEHasUnknownBit, - MSEGuidBit1, + MSEGuidBit4, + MSEGuidBit5, + MSEHasUnkTime, + MSEGuidBit3, + MSEHasUnknownBit, + MSEHasFallData, MSEGuidBit0, - MSEHasSpline, + MSEGuidBit1, + MSEHasPitch, + MSEGuidBit6, MSEHasMovementFlags, MSEGuidBit2, - MSEGuidBit6, - MSEHasPitch, - MSEHasTransportData, - MSEGuidBit3, - MSEHasSplineElevation, - MSEHasTimestamp, + MSEHasUnknownBit, MSEHasMovementFlags2, + MSEHasSplineElevation, MSEHasOrientation, MSEGuidBit7, - MSETransportGuidBit2, - MSETransportGuidBit7, + MSEHasTimestamp, + MSEFlags2, + MSETransportGuidBit1, MSEHasTransportTime3, - MSETransportGuidBit4, MSEHasTransportTime2, - MSETransportGuidBit5, - MSETransportGuidBit0, MSETransportGuidBit3, MSETransportGuidBit6, - MSETransportGuidBit1, - MSEHasFallDirection, + MSETransportGuidBit2, + MSETransportGuidBit0, + MSETransportGuidBit5, + MSETransportGuidBit7, + MSETransportGuidBit4, MSEFlags, - MSEFlags2, - MSEGuidByte3, + MSEHasFallDirection, MSEGuidByte2, + MSEGuidByte3, MSEGuidByte6, - MSEGuidByte4, + MSEMovementCounter, MSEGuidByte0, + MSEGuidByte5, + MSEGuidByte4, MSEGuidByte7, MSEGuidByte1, - MSEGuidByte5, - MSESplineElevation, + MSETransportTime, + MSETransportTime3, + MSETransportPositionY, MSETransportPositionX, - MSETransportGuidByte5, - MSETransportSeat, - MSETransportGuidByte2, + MSETransportTime2, + MSETransportGuidByte4, MSETransportGuidByte3, MSETransportPositionO, - MSETransportTime2, - MSETransportTime3, - MSETransportGuidByte7, - MSETransportGuidByte1, MSETransportGuidByte0, - MSETransportGuidByte4, - MSETransportPositionY, MSETransportPositionZ, - MSETransportTime, MSETransportGuidByte6, - MSEFallTime, - MSEFallHorizontalSpeed, - MSEFallCosAngle, - MSEFallSinAngle, - MSEFallVerticalSpeed, - MSETimestamp, - MSEPitch, + MSETransportGuidByte7, + MSETransportGuidByte5, + MSETransportGuidByte1, + MSETransportGuidByte2, MSEPositionO, + MSETimestamp, + MSEFallSinAngle, + MSEFallCosAngle, + MSEFallHorizontalSpeed, + MSEFallVerticalSpeed, + MSEFallTime, + MSEUnkTime, + MSESplineElevation, + MSEPitch, MSEEnd, }; @@ -2649,11 +2660,11 @@ MovementStatusElements* GetMovementStatusElementsSequence(uint16 opcode) return MovementStartTurnLeftSequence; case MSG_MOVE_START_TURN_RIGHT: // 5.4.8 return MovementStartTurnRightSequence; - case CMSG_MOVE_STOP: + case MSG_MOVE_STOP: // 5.4.8 return MovementStopSequence; - case CMSG_MOVE_STOP_STRAFE: + case MSG_MOVE_STOP_STRAFE: // 5.4.8 return MovementStopStrafeSequence; - case CMSG_MOVE_STOP_TURN: + case MSG_MOVE_STOP_TURN: // 5.4.8 return MovementStopTurnSequence; case CMSG_MOVE_START_ASCEND: return MovementStartAscendSequence;