diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp index d35c0c957..428ceb43b 100644 --- a/src/game/Server/Opcodes.cpp +++ b/src/game/Server/Opcodes.cpp @@ -254,8 +254,8 @@ void InitializeOpcodes() //OPCODE(CMSG_DESTROY_ITEMS, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); OPCODE(SMSG_GAMEOBJECT_CUSTOM_ANIM, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); OPCODE(CMSG_AREATRIGGER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAreaTriggerOpcode ); - OPCODE(CMSG_MOVE_START_FORWARD, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); - OPCODE(CMSG_MOVE_START_BACKWARD, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes ); + 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 ); diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h index 54524b595..51dae443e 100644 --- a/src/game/Server/Opcodes.h +++ b/src/game/Server/Opcodes.h @@ -247,8 +247,8 @@ enum Opcodes CMSG_DESTROY_ITEMS = 0x10B3, SMSG_GAMEOBJECT_CUSTOM_ANIM = 0x4936, // 4.3.4 15595 CMSG_AREATRIGGER = 0x155A, // 5.4.7 18019 - CMSG_MOVE_START_FORWARD = 0x13C9, // 5.4.1 17538 - CMSG_MOVE_START_BACKWARD = 0x12C0, // 5.4.1 17538 + 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 diff --git a/src/game/movement/MovementStructures.h b/src/game/movement/MovementStructures.h index 4eec30566..25655f8f4 100644 --- a/src/game/movement/MovementStructures.h +++ b/src/game/movement/MovementStructures.h @@ -557,145 +557,153 @@ MovementStatusElements MovementSetPitchSequence[] = MovementStatusElements MovementStartBackwardSequence[] = { - MSEPositionX, - MSEPositionZ, MSEPositionY, - MSEHasTransportData, - MSEGuidBit3, - MSEGuidBit0, - MSEGuidBit2, + MSEPositionZ, + MSEPositionX, MSEHasTimestamp, - MSEGuidBit7, - MSEHasPitch, - MSEHasUnknownBit, - MSEHasMovementFlags, MSEHasOrientation, - MSEHasSpline, - MSEHasMovementFlags2, + MSEGuidBit7, + MSEGuidBit2, + MSECounterCount, MSEHasFallData, + MSEHasUnknownBit, MSEGuidBit5, - MSEGuidBit1, - MSEGuidBit4, + MSEGuidBit3, MSEGuidBit6, MSEHasSplineElevation, - MSETransportGuidBit3, + MSEGuidBit4, + MSEHasTransportData, + MSEGuidBit0, + MSEHasMovementFlags, + MSEHasPitch, + MSEHasUnkTime, + MSEHasMovementFlags2, + MSEHasUnknownBit, + MSEGuidBit1, + MSEHasUnknownBit, MSETransportGuidBit1, MSEHasTransportTime2, - MSETransportGuidBit2, - MSETransportGuidBit7, MSETransportGuidBit0, - MSETransportGuidBit6, - MSETransportGuidBit5, - MSETransportGuidBit4, + MSETransportGuidBit7, MSEHasTransportTime3, - MSEFlags, + MSETransportGuidBit3, + MSETransportGuidBit5, + MSETransportGuidBit6, + MSETransportGuidBit2, + MSETransportGuidBit4, MSEFlags2, + MSEFlags, MSEHasFallDirection, - MSEGuidByte6, - MSEGuidByte7, - MSEGuidByte4, + MSEMovementCounter, MSEGuidByte1, - MSEGuidByte5, - MSEGuidByte0, - MSEGuidByte2, MSEGuidByte3, + MSEGuidByte5, + MSEGuidByte2, + MSEGuidByte0, + MSEGuidByte4, + MSEGuidByte7, + MSEGuidByte6, + MSEUnkTime, + MSETransportTime, + MSETransportGuidByte4, + MSETransportGuidByte1, + MSETransportGuidByte5, + MSETransportGuidByte3, + MSETransportGuidByte6, + MSETransportPositionO, + MSETransportPositionX, + MSETransportGuidByte0, + MSETransportPositionY, + MSETransportTime3, + MSETransportGuidByte7, + MSETransportTime2, MSETransportPositionZ, MSETransportGuidByte2, - MSETransportTime3, - MSETransportGuidByte0, - MSETransportGuidByte5, - MSETransportPositionY, - MSETransportGuidByte1, - MSETransportPositionX, - MSETransportTime2, - MSETransportGuidByte4, - MSETransportPositionO, - MSETransportSeat, - MSETransportGuidByte7, - MSETransportTime, - MSETransportGuidByte6, - MSETransportGuidByte3, - MSEPitch, - MSETimestamp, - MSEFallHorizontalSpeed, + MSEPositionO, + MSEFallTime, MSEFallSinAngle, MSEFallCosAngle, + MSEFallHorizontalSpeed, MSEFallVerticalSpeed, - MSEFallTime, - MSEPositionO, + MSEPitch, + MSETimestamp, MSESplineElevation, MSEEnd, }; MovementStatusElements MovementStartForwardSequence[] = { - MSEPositionY, MSEPositionZ, MSEPositionX, - MSEGuidBit5, - MSEGuidBit2, - MSEGuidBit0, - MSEHasUnknownBit, - MSEHasMovementFlags, - MSEGuidBit7, - MSEGuidBit3, - MSEGuidBit1, - MSEHasOrientation, - MSEGuidBit6, - MSEHasSpline, - MSEHasSplineElevation, - MSEGuidBit4, - MSEHasTransportData, - MSEHasTimestamp, - MSEHasPitch, + MSEPositionY, MSEHasMovementFlags2, + MSEHasUnknownBit, + MSEHasUnkTime, + MSEHasUnknownBit, + MSEGuidBit0, + MSEHasOrientation, MSEHasFallData, - MSEFlags, + MSECounterCount, + MSEGuidBit4, + MSEGuidBit1, + MSEHasTimestamp, + MSEGuidBit7, + MSEHasPitch, + MSEHasTransportData, + MSEGuidBit5, + MSEHasMovementFlags, + MSEGuidBit3, + MSEHasSplineElevation, + MSEGuidBit2, + MSEGuidBit6, + MSEHasUnknownBit, + MSETransportGuidBit1, + MSEHasTransportTime3, MSETransportGuidBit3, MSETransportGuidBit4, - MSETransportGuidBit6, MSETransportGuidBit2, MSETransportGuidBit5, MSETransportGuidBit0, MSETransportGuidBit7, - MSETransportGuidBit1, - MSEHasTransportTime3, + MSETransportGuidBit6, MSEHasTransportTime2, MSEHasFallDirection, MSEFlags2, - MSEGuidByte2, - MSEGuidByte4, - MSEGuidByte6, + MSEFlags, MSEGuidByte1, + MSEGuidByte6, MSEGuidByte7, - MSEGuidByte3, + MSEMovementCounter, MSEGuidByte5, MSEGuidByte0, - MSEFallVerticalSpeed, - MSEFallHorizontalSpeed, - MSEFallCosAngle, - MSEFallSinAngle, - MSEFallTime, + MSEGuidByte3, + MSEGuidByte2, + MSEGuidByte4, MSETransportGuidByte3, - MSETransportPositionY, - MSETransportPositionZ, MSETransportGuidByte1, + MSETransportGuidByte6, + MSETransportPositionZ, MSETransportGuidByte4, + MSETransportTime3, MSETransportGuidByte7, MSETransportPositionO, + MSETransportTime2, + MSETransportGuidByte5, MSETransportGuidByte2, MSETransportPositionX, - MSETransportGuidByte5, - MSETransportTime3, - MSETransportTime, - MSETransportGuidByte6, MSETransportGuidByte0, - MSETransportSeat, - MSETransportTime2, - MSESplineElevation, - MSEPitch, - MSEPositionO, + MSETransportPositionY, + MSETransportTime, + MSEFallCosAngle, + MSEFallSinAngle, + MSEFallHorizontalSpeed, + MSEFallTime, + MSEFallVerticalSpeed, MSETimestamp, + MSEPitch, + MSESplineElevation, + MSEPositionO, + MSEUnkTime, MSEEnd, }; @@ -2613,9 +2621,9 @@ MovementStatusElements* GetMovementStatusElementsSequence(uint16 opcode) return MovementSetWalkModeSequence; case CMSG_MOVE_SPLINE_DONE: return MovementSplineDoneSequence; - case CMSG_MOVE_START_BACKWARD: + case MSG_MOVE_START_BACKWARD: return MovementStartBackwardSequence; - case CMSG_MOVE_START_FORWARD: + case MSG_MOVE_START_FORWARD: return MovementStartForwardSequence; case CMSG_MOVE_START_STRAFE_LEFT: return MovementStartStrafeLeftSequence;