diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp index 88113f551..de863b972 100644 --- a/src/game/Server/Opcodes.cpp +++ b/src/game/Server/Opcodes.cpp @@ -260,7 +260,7 @@ void InitializeOpcodes() 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(CMSG_MOVE_STOP_STRAFE, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); - OPCODE(CMSG_MOVE_JUMP, 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 ); OPCODE(CMSG_MOVE_START_TURN_RIGHT, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); OPCODE(CMSG_MOVE_STOP_TURN, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h index cbaf5a845..5ef8065aa 100644 --- a/src/game/Server/Opcodes.h +++ b/src/game/Server/Opcodes.h @@ -253,7 +253,7 @@ enum Opcodes CMSG_MOVE_START_STRAFE_LEFT = 0x0EC8, // 5.4.1 17538 CMSG_MOVE_START_STRAFE_RIGHT = 0x0269, // 5.4.1 17538 CMSG_MOVE_STOP_STRAFE = 0x12C9, // 5.4.1 17538 - CMSG_MOVE_JUMP = 0x07C9, // 5.4.1 17538 + MSG_MOVE_JUMP = 0x1153, // 5.4.8 18414 CMSG_MOVE_START_TURN_LEFT = 0x0760, // 5.4.1 17538 CMSG_MOVE_START_TURN_RIGHT = 0x17C9, // 5.4.1 17538 CMSG_MOVE_STOP_TURN = 0x1749, // 5.4.1 17538 diff --git a/src/game/movement/MovementStructures.h b/src/game/movement/MovementStructures.h index 62be324b9..212a17bb6 100644 --- a/src/game/movement/MovementStructures.h +++ b/src/game/movement/MovementStructures.h @@ -336,70 +336,74 @@ MovementStatusElements MovementJumpSequence[] = MSEPositionY, MSEPositionX, MSEPositionZ, - MSEHasTimestamp, - MSEGuidBit5, - MSEHasMovementFlags, - MSEGuidBit4, - MSEGuidBit6, - MSEHasMovementFlags2, - MSEGuidBit0, - MSEHasTransportData, - MSEGuidBit3, - MSEHasPitch, - MSEGuidBit7, - MSEHasFallData, - MSEHasSpline, - MSEHasOrientation, MSEGuidBit1, + MSEGuidBit7, + MSEHasMovementFlags2, + MSEGuidBit5, MSEHasSplineElevation, + MSEHasOrientation, + MSEGuidBit6, + MSEGuidBit4, MSEHasUnknownBit, + MSEHasTransportData, + MSEHasUnknownBit, + MSECounterCount, + MSEHasPitch, + MSEHasMovementFlags, + MSEHasTimestamp, + MSEHasUnkTime, + MSEGuidBit3, + MSEHasUnknownBit, + MSEHasFallData, MSEGuidBit2, + MSEGuidBit0, + MSETransportGuidBit2, MSETransportGuidBit3, - MSETransportGuidBit7, - MSETransportGuidBit6, - MSETransportGuidBit0, - MSETransportGuidBit5, MSETransportGuidBit1, MSETransportGuidBit4, - MSEHasTransportTime3, MSEHasTransportTime2, - MSETransportGuidBit2, - MSEHasFallDirection, + MSETransportGuidBit5, + MSETransportGuidBit6, + MSETransportGuidBit0, + MSETransportGuidBit7, + MSEHasTransportTime3, MSEFlags, MSEFlags2, - MSEGuidByte6, - MSEGuidByte5, - MSEGuidByte4, - MSEGuidByte0, - MSEGuidByte2, - MSEGuidByte3, + MSEHasFallDirection, MSEGuidByte7, MSEGuidByte1, - MSETransportGuidByte1, - MSETransportGuidByte7, - MSETransportPositionX, - MSETransportGuidByte4, - MSETransportTime3, - MSETransportGuidByte0, - MSETransportPositionO, - MSETransportTime2, - MSETransportTime, - MSETransportGuidByte6, - MSETransportPositionZ, - MSETransportSeat, - MSETransportPositionY, - MSETransportGuidByte3, - MSETransportGuidByte2, - MSETransportGuidByte5, - MSEPitch, - MSETimestamp, - MSEFallCosAngle, - MSEFallSinAngle, - MSEFallHorizontalSpeed, + MSEGuidByte0, + MSEMovementCounter, + MSEGuidByte2, + MSEGuidByte6, + MSEGuidByte3, + MSEGuidByte4, + MSEGuidByte5, MSEFallVerticalSpeed, + MSEFallSinAngle, + MSEFallCosAngle, + MSEFallHorizontalSpeed, MSEFallTime, + MSETransportGuidByte5, + MSETransportGuidByte7, + MSETransportGuidByte4, + MSETransportGuidByte0, + MSETransportPositionZ, + MSETransportGuidByte6, + MSETransportGuidByte2, + MSETransportPositionY, + MSETransportTime, + MSETransportPositionX, + MSETransportTime2, + MSETransportGuidByte1, + MSETransportGuidByte3, + MSETransportTime3, + MSETransportPositionO, MSESplineElevation, MSEPositionO, + MSEPitch, + MSEUnkTime, + MSETimestamp, MSEEnd, }; @@ -2591,7 +2595,7 @@ MovementStatusElements* GetMovementStatusElementsSequence(uint16 opcode) return MovementFallLandSequence; case CMSG_MOVE_FALL_RESET: return MovementFallResetSequence; - case CMSG_MOVE_JUMP: + case MSG_MOVE_JUMP: return MovementJumpSequence; case CMSG_MOVE_SET_CAN_FLY_ACK: return MovementSetCanFlyAckSequence;