From f715dd508736fc58055ee493a0f74ffc42b9b95a Mon Sep 17 00:00:00 2001 From: zamalaev Date: Wed, 19 Feb 2020 23:56:22 +0000 Subject: [PATCH] MSG_MOVE_START_PITCH_UP/DOWN 5.4.8 18414 --- src/game/Server/Opcodes.cpp | 4 +- src/game/Server/Opcodes.h | 4 +- src/game/movement/MovementStructures.h | 204 +++++++++++++------------ 3 files changed, 110 insertions(+), 102 deletions(-) diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp index cc9a35acf..63fb836b2 100644 --- a/src/game/Server/Opcodes.cpp +++ b/src/game/Server/Opcodes.cpp @@ -264,8 +264,8 @@ void InitializeOpcodes() 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(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(MSG_MOVE_START_PITCH_UP, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); + OPCODE(MSG_MOVE_START_PITCH_DOWN, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(MSG_MOVE_STOP_PITCH, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(CMSG_MOVE_SET_RUN_MODE, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(CMSG_MOVE_SET_WALK_MODE, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h index 88698fcf7..54a020f2e 100644 --- a/src/game/Server/Opcodes.h +++ b/src/game/Server/Opcodes.h @@ -257,8 +257,8 @@ enum Opcodes MSG_MOVE_START_TURN_LEFT = 0x01D0, // 5.4.8 18414 MSG_MOVE_START_TURN_RIGHT = 0x107B, // 5.4.8 18414 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 + MSG_MOVE_START_PITCH_UP = 0x00D8, // 5.4.8 18414 + MSG_MOVE_START_PITCH_DOWN = 0x08D8, // 5.4.8 18414 MSG_MOVE_STOP_PITCH = 0x007A, // 5.4.8 18414 CMSG_MOVE_SET_RUN_MODE = 0x0748, // 5.4.1 17538 CMSG_MOVE_SET_WALK_MODE = 0x0BE1, // 5.4.1 17538 diff --git a/src/game/movement/MovementStructures.h b/src/game/movement/MovementStructures.h index 99f8aae36..ff167001d 100644 --- a/src/game/movement/MovementStructures.h +++ b/src/game/movement/MovementStructures.h @@ -1697,144 +1697,152 @@ MovementStatusElements MovementStopPitchSequence[] = MovementStatusElements MovementStartPitchDownSequence[] = { - MSEPositionX, MSEPositionZ, MSEPositionY, - MSEHasMovementFlags, - MSEGuidBit7, - MSEGuidBit6, - MSEHasPitch, - MSEHasUnknownBit, - MSEGuidBit1, - MSEGuidBit4, - MSEHasTimestamp, - MSEHasSplineElevation, - MSEHasMovementFlags2, - MSEHasTransportData, - MSEGuidBit0, - MSEGuidBit5, - MSEGuidBit3, - MSEHasSpline, - MSEHasOrientation, - MSEHasFallData, + MSEPositionX, MSEGuidBit2, - MSETransportGuidBit1, - MSETransportGuidBit5, - MSEHasTransportTime3, - MSETransportGuidBit7, - MSETransportGuidBit4, - MSETransportGuidBit6, + MSEGuidBit7, + MSEGuidBit3, + MSEHasOrientation, + MSEGuidBit5, + MSEHasUnknownBit, + MSEHasUnkTime, + MSEHasUnknownBit, + MSEHasMovementFlags, + MSEGuidBit4, + MSEGuidBit1, + MSEHasSplineElevation, + MSEHasFallData, + MSEHasUnknownBit, + MSEHasTransportData, + MSEHasTimestamp, + MSEHasMovementFlags2, + MSECounterCount, + MSEGuidBit6, + MSEGuidBit0, + MSEHasPitch, MSEHasTransportTime2, - MSETransportGuidBit0, - MSETransportGuidBit3, MSETransportGuidBit2, + MSETransportGuidBit6, + MSETransportGuidBit3, + MSETransportGuidBit7, + MSETransportGuidBit5, + MSETransportGuidBit4, + MSEHasTransportTime3, + MSETransportGuidBit1, + MSETransportGuidBit0, + MSEFlags, MSEFlags2, MSEHasFallDirection, - MSEFlags, - MSEGuidByte3, - MSEGuidByte7, - MSEGuidByte0, - MSEGuidByte5, - MSEGuidByte2, MSEGuidByte6, + MSEGuidByte3, + MSEGuidByte5, + MSEGuidByte0, MSEGuidByte4, + MSEMovementCounter, + MSEGuidByte7, + MSEGuidByte2, MSEGuidByte1, - MSETransportTime3, - MSETransportGuidByte3, - MSETransportTime2, - MSETransportGuidByte5, - MSETransportGuidByte1, - MSETransportPositionY, - MSETransportGuidByte6, - MSETransportGuidByte4, - MSETransportTime, - MSETransportPositionZ, - MSETransportPositionX, - MSETransportGuidByte0, - MSETransportSeat, - MSETransportGuidByte2, - MSETransportGuidByte7, - MSETransportPositionO, - MSEFallSinAngle, MSEFallHorizontalSpeed, MSEFallCosAngle, - MSEFallVerticalSpeed, + MSEFallSinAngle, MSEFallTime, - MSEPitch, + MSEFallVerticalSpeed, + MSETransportPositionO, + MSETransportGuidByte4, + MSETransportGuidByte7, + MSETransportPositionZ, + MSETransportGuidByte0, + MSETransportTime, + MSETransportGuidByte6, + MSETransportGuidByte1, + MSETransportGuidByte2, + MSETransportGuidByte5, + MSETransportPositionX, + MSETransportTime3, + MSETransportPositionY, + MSETransportGuidByte3, + MSETransportTime2, MSEPositionO, - MSESplineElevation, MSETimestamp, + MSESplineElevation, + MSEUnkTime, + MSEPitch, MSEEnd, }; MovementStatusElements MovementStartPitchUpSequence[] = { - MSEPositionZ, MSEPositionY, + MSEPositionZ, MSEPositionX, - MSEGuidBit4, - MSEHasMovementFlags, - MSEHasMovementFlags2, - MSEHasSpline, - MSEGuidBit2, - MSEGuidBit6, + MSEGuidBit0, + MSEHasPitch, MSEGuidBit3, MSEHasUnknownBit, - MSEHasSplineElevation, - MSEHasFallData, - MSEGuidBit0, - MSEHasTransportData, - MSEGuidBit1, - MSEGuidBit5, - MSEHasPitch, - MSEHasTimestamp, MSEHasOrientation, + MSEGuidBit5, + MSEHasUnknownBit, + MSEGuidBit2, MSEGuidBit7, - MSEFlags2, - MSETransportGuidBit7, - MSETransportGuidBit3, + MSEGuidBit1, + MSEHasFallData, + MSEHasMovementFlags2, + MSEHasTransportData, + MSEHasUnkTime, + MSEHasMovementFlags, + MSEGuidBit6, + MSECounterCount, + MSEHasTimestamp, + MSEGuidBit4, + MSEHasUnknownBit, + MSEHasSplineElevation, + MSETransportGuidBit5, MSETransportGuidBit1, MSEHasTransportTime2, MSETransportGuidBit4, - MSEHasTransportTime3, - MSETransportGuidBit0, - MSETransportGuidBit6, - MSETransportGuidBit5, MSETransportGuidBit2, + MSETransportGuidBit6, + MSETransportGuidBit0, + MSEHasTransportTime3, + MSETransportGuidBit7, + MSETransportGuidBit3, + MSEFlags2, MSEFlags, MSEHasFallDirection, - MSEGuidByte0, - MSEGuidByte3, - MSEGuidByte4, MSEGuidByte6, + MSEMovementCounter, + MSEGuidByte0, + MSEGuidByte5, MSEGuidByte7, MSEGuidByte1, - MSEGuidByte5, + MSEGuidByte3, + MSEGuidByte4, MSEGuidByte2, - MSETransportPositionX, - MSETransportGuidByte1, MSETransportGuidByte3, - MSETransportGuidByte2, - MSETransportGuidByte0, - MSETransportTime, - MSETransportPositionZ, - MSETransportPositionO, - MSETransportGuidByte7, - MSETransportTime2, - MSETransportSeat, - MSETransportGuidByte6, - MSETransportGuidByte5, MSETransportTime3, + MSETransportGuidByte2, + MSETransportGuidByte7, + MSETransportGuidByte0, MSETransportPositionY, MSETransportGuidByte4, - MSEFallTime, - MSEFallCosAngle, - MSEFallSinAngle, - MSEFallHorizontalSpeed, - MSEFallVerticalSpeed, + MSETransportGuidByte5, + MSETransportTime2, + MSETransportGuidByte1, + MSETransportPositionX, + MSETransportPositionO, + MSETransportGuidByte6, + MSETransportTime, + MSETransportPositionZ, + MSEPitch, MSEPositionO, MSESplineElevation, - MSEPitch, + MSEFallVerticalSpeed, + MSEFallHorizontalSpeed, + MSEFallSinAngle, + MSEFallCosAngle, + MSEFallTime, + MSEUnkTime, MSETimestamp, MSEEnd, }; @@ -2701,9 +2709,9 @@ MovementStatusElements* GetMovementStatusElementsSequence(uint16 opcode) return MovementStopSwimSequence; case MSG_MOVE_STOP_ASCEND:// 5.4.8 return MovementStopAscendSequence; - case CMSG_MOVE_START_PITCH_DOWN: + case MSG_MOVE_START_PITCH_DOWN: // 5.4.8 return MovementStartPitchDownSequence; - case CMSG_MOVE_START_PITCH_UP: + case MSG_MOVE_START_PITCH_UP: // 5.4.8 return MovementStartPitchUpSequence; case MSG_MOVE_STOP_PITCH: // 5.4.8 return MovementStopPitchSequence;