MSG_MOVE_STOP/STRAFE/TURN 5.4.8 18414

This commit is contained in:
zamalaev 2020-02-19 23:12:05 +00:00 committed by Antz
parent 96887fe901
commit a1605728a1
3 changed files with 150 additions and 139 deletions

View file

@ -256,14 +256,14 @@ void InitializeOpcodes()
OPCODE(CMSG_AREATRIGGER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAreaTriggerOpcode ); OPCODE(CMSG_AREATRIGGER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAreaTriggerOpcode );
OPCODE(MSG_MOVE_START_FORWARD, 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(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_LEFT, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );
OPCODE(MSG_MOVE_START_STRAFE_RIGHT, 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_JUMP, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );
OPCODE(MSG_MOVE_START_TURN_LEFT, 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(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_UP, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );
OPCODE(CMSG_MOVE_START_PITCH_DOWN, 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 ); OPCODE(CMSG_MOVE_STOP_PITCH, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );

View file

@ -249,14 +249,14 @@ enum Opcodes
CMSG_AREATRIGGER = 0x155A, // 5.4.7 18019 CMSG_AREATRIGGER = 0x155A, // 5.4.7 18019
MSG_MOVE_START_FORWARD = 0x095A, // 5.4.8 18414 MSG_MOVE_START_FORWARD = 0x095A, // 5.4.8 18414
MSG_MOVE_START_BACKWARD = 0x09D8, // 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_LEFT = 0x01F8, // 5.4.8 18414
MSG_MOVE_START_STRAFE_RIGHT = 0x1058, // 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_JUMP = 0x1153, // 5.4.8 18414
MSG_MOVE_START_TURN_LEFT = 0x01D0, // 5.4.8 18414 MSG_MOVE_START_TURN_LEFT = 0x01D0, // 5.4.8 18414
MSG_MOVE_START_TURN_RIGHT = 0x107B, // 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_UP = 0x0FE1, // 5.4.1 17538
CMSG_MOVE_START_PITCH_DOWN = 0x16E8, // 5.4.1 17538 CMSG_MOVE_START_PITCH_DOWN = 0x16E8, // 5.4.1 17538
CMSG_MOVE_STOP_PITCH = 0x1A48, // 5.4.1 17538 CMSG_MOVE_STOP_PITCH = 0x1A48, // 5.4.1 17538

View file

@ -799,7 +799,7 @@ MovementStatusElements MovementStartStrafeRightSequence[] =
MSEHasSplineElevation, MSEHasSplineElevation,
MSEGuidBit3, MSEGuidBit3,
MSEHasUnknownBit, MSEHasUnknownBit,
MSEHasTransportData, MSEHasTransportData,
MSEHasUnkTime, MSEHasUnkTime,
MSEGuidBit1, MSEGuidBit1,
MSEHasUnknownBit, MSEHasUnknownBit,
@ -1016,142 +1016,149 @@ MovementStatusElements MovementStopSequence[] =
MSEPositionX, MSEPositionX,
MSEPositionY, MSEPositionY,
MSEPositionZ, MSEPositionZ,
MSEGuidBit3,
MSEGuidBit6,
MSEHasSplineElevation,
MSEHasSpline,
MSEHasOrientation,
MSEGuidBit7,
MSEHasMovementFlags,
MSEGuidBit5, MSEGuidBit5,
MSEHasFallData,
MSEHasMovementFlags2,
MSEHasTransportData,
MSEHasTimestamp,
MSEGuidBit4,
MSEGuidBit1,
MSEHasUnknownBit,
MSEGuidBit2, MSEGuidBit2,
MSEHasFallData,
MSEGuidBit0, MSEGuidBit0,
MSEHasUnknownBit,
MSEHasUnknownBit,
MSEHasUnkTime,
MSEGuidBit1,
MSECounterCount,
MSEHasPitch, MSEHasPitch,
MSEGuidBit3,
MSEGuidBit4,
MSEHasTransportData,
MSEHasUnknownBit,
MSEGuidBit6,
MSEHasMovementFlags,
MSEHasTimestamp,
MSEHasMovementFlags2,
MSEHasOrientation,
MSEHasSplineElevation,
MSEGuidBit7,
MSEHasTransportTime2,
MSETransportGuidBit7, MSETransportGuidBit7,
MSETransportGuidBit4, MSETransportGuidBit4,
MSETransportGuidBit1, MSETransportGuidBit1,
MSETransportGuidBit5,
MSEHasTransportTime2,
MSEHasTransportTime3,
MSETransportGuidBit3,
MSETransportGuidBit6,
MSETransportGuidBit0, MSETransportGuidBit0,
MSETransportGuidBit5,
MSETransportGuidBit2, MSETransportGuidBit2,
MSEFlags, MSETransportGuidBit3,
MSEHasTransportTime3,
MSETransportGuidBit6,
MSEFlags2, MSEFlags2,
MSEHasFallDirection, MSEFlags,
MSEGuidByte6,
MSEGuidByte3,
MSEGuidByte0, MSEGuidByte0,
MSEGuidByte3,
MSEMovementCounter,
MSEGuidByte6,
MSEGuidByte1,
MSEGuidByte4, MSEGuidByte4,
MSEGuidByte2, MSEGuidByte2,
MSEGuidByte1,
MSEGuidByte5, MSEGuidByte5,
MSEGuidByte7, MSEGuidByte7,
MSETransportGuidByte4,
MSETransportGuidByte7,
MSETransportTime,
MSETransportSeat,
MSETransportPositionZ,
MSETransportTime3,
MSETransportGuidByte2,
MSETransportGuidByte0,
MSETransportPositionY,
MSETransportGuidByte1,
MSETransportGuidByte3,
MSETransportTime2,
MSETransportPositionX,
MSETransportPositionO,
MSETransportGuidByte5,
MSETransportGuidByte6,
MSETimestamp,
MSEPositionO, MSEPositionO,
MSEPitch,
MSESplineElevation,
MSEFallCosAngle,
MSEFallSinAngle,
MSEFallHorizontalSpeed,
MSEFallVerticalSpeed, MSEFallVerticalSpeed,
MSEFallHorizontalSpeed,
MSEFallSinAngle,
MSEFallCosAngle,
MSEFallTime, MSEFallTime,
MSESplineElevation,
MSETransportPositionX,
MSETransportTime,
MSETransportGuidByte3,
MSETransportPositionO,
MSETransportPositionY,
MSETransportGuidByte2,
MSETransportGuidByte6,
MSETransportGuidByte7,
MSETransportGuidByte1,
MSETransportGuidByte4,
MSETransportTime3,
MSETransportGuidByte0,
MSETransportPositionZ,
MSETransportGuidByte5,
MSETransportTime2,
MSEUnkTime,
MSEPitch,
MSETimestamp,
MSEEnd, MSEEnd,
}; };
MovementStatusElements MovementStopStrafeSequence[] = MovementStatusElements MovementStopStrafeSequence[] =
{ {
MSEPositionY,
MSEPositionZ, MSEPositionZ,
MSEPositionX, MSEPositionX,
MSEHasPitch, MSEPositionY,
MSEHasTimestamp,
MSEGuidBit2,
MSEHasFallData, MSEHasFallData,
MSEGuidBit7,
MSEHasSplineElevation,
MSEGuidBit3,
MSEHasOrientation, MSEHasOrientation,
MSEHasMovementFlags2, MSEHasSplineElevation,
MSEHasTransportData, MSEHasTimestamp,
MSEHasMovementFlags, MSEHasMovementFlags,
MSEHasSpline, MSEHasUnkTime,
MSEGuidBit6,
MSEHasTransportData,
MSEHasUnknownBit,
MSEHasMovementFlags2,
MSEGuidBit4,
MSEHasPitch,
MSEGuidBit5,
MSEGuidBit3,
MSEGuidBit2,
MSECounterCount,
MSEHasUnknownBit,
MSEGuidBit7,
MSEGuidBit0, MSEGuidBit0,
MSEHasUnknownBit, MSEHasUnknownBit,
MSEGuidBit6,
MSEGuidBit5,
MSEGuidBit1, MSEGuidBit1,
MSEGuidBit4,
MSETransportGuidBit7, MSETransportGuidBit7,
MSETransportGuidBit0,
MSETransportGuidBit4,
MSETransportGuidBit2,
MSETransportGuidBit6,
MSETransportGuidBit5,
MSEHasTransportTime2,
MSETransportGuidBit1,
MSETransportGuidBit3,
MSEHasTransportTime3, MSEHasTransportTime3,
MSEFlags, MSETransportGuidBit3,
MSEHasFallDirection, MSETransportGuidBit1,
MSETransportGuidBit6,
MSEHasTransportTime2,
MSETransportGuidBit2,
MSETransportGuidBit5,
MSETransportGuidBit4,
MSETransportGuidBit0,
MSEFlags2, MSEFlags2,
MSEGuidByte2, MSEHasFallDirection,
MSEGuidByte7, MSEFlags,
MSEGuidByte3,
MSEGuidByte4,
MSEGuidByte5, MSEGuidByte5,
MSEGuidByte6, MSEGuidByte3,
MSEGuidByte1, MSEMovementCounter,
MSEGuidByte2,
MSEGuidByte0, MSEGuidByte0,
MSETransportSeat, MSEGuidByte1,
MSETransportGuidByte6, MSEGuidByte6,
MSETransportPositionZ, MSEGuidByte4,
MSEGuidByte7,
MSETransportGuidByte0,
MSETransportTime3, MSETransportTime3,
MSETransportGuidByte1, MSETransportGuidByte1,
MSETransportGuidByte3, MSETransportGuidByte6,
MSETransportGuidByte2,
MSETransportGuidByte4,
MSETransportGuidByte5,
MSETransportTime, MSETransportTime,
MSETransportPositionO,
MSETransportPositionX,
MSETransportGuidByte0,
MSETransportPositionY, MSETransportPositionY,
MSETransportPositionZ,
MSETransportGuidByte4,
MSETransportTime2, MSETransportTime2,
MSETransportGuidByte3,
MSETransportPositionX,
MSETransportGuidByte2,
MSETransportGuidByte7, MSETransportGuidByte7,
MSETransportGuidByte5,
MSETransportPositionO,
MSEPositionO,
MSESplineElevation,
MSETimestamp,
MSEFallCosAngle, MSEFallCosAngle,
MSEFallHorizontalSpeed,
MSEFallSinAngle, MSEFallSinAngle,
MSEFallHorizontalSpeed,
MSEFallTime, MSEFallTime,
MSEFallVerticalSpeed, MSEFallVerticalSpeed,
MSESplineElevation,
MSEPositionO,
MSEPitch, MSEPitch,
MSETimestamp, MSEUnkTime,
MSEEnd, MSEEnd,
}; };
@ -1160,70 +1167,74 @@ MovementStatusElements MovementStopTurnSequence[] =
MSEPositionX, MSEPositionX,
MSEPositionZ, MSEPositionZ,
MSEPositionY, MSEPositionY,
MSEGuidBit5, MSEHasTransportData,
MSEGuidBit4, MSECounterCount,
MSEHasFallData,
MSEHasUnknownBit, MSEHasUnknownBit,
MSEGuidBit1, MSEGuidBit4,
MSEGuidBit5,
MSEHasUnkTime,
MSEGuidBit3,
MSEHasUnknownBit,
MSEHasFallData,
MSEGuidBit0, MSEGuidBit0,
MSEHasSpline, MSEGuidBit1,
MSEHasPitch,
MSEGuidBit6,
MSEHasMovementFlags, MSEHasMovementFlags,
MSEGuidBit2, MSEGuidBit2,
MSEGuidBit6, MSEHasUnknownBit,
MSEHasPitch,
MSEHasTransportData,
MSEGuidBit3,
MSEHasSplineElevation,
MSEHasTimestamp,
MSEHasMovementFlags2, MSEHasMovementFlags2,
MSEHasSplineElevation,
MSEHasOrientation, MSEHasOrientation,
MSEGuidBit7, MSEGuidBit7,
MSETransportGuidBit2, MSEHasTimestamp,
MSETransportGuidBit7, MSEFlags2,
MSETransportGuidBit1,
MSEHasTransportTime3, MSEHasTransportTime3,
MSETransportGuidBit4,
MSEHasTransportTime2, MSEHasTransportTime2,
MSETransportGuidBit5,
MSETransportGuidBit0,
MSETransportGuidBit3, MSETransportGuidBit3,
MSETransportGuidBit6, MSETransportGuidBit6,
MSETransportGuidBit1, MSETransportGuidBit2,
MSEHasFallDirection, MSETransportGuidBit0,
MSETransportGuidBit5,
MSETransportGuidBit7,
MSETransportGuidBit4,
MSEFlags, MSEFlags,
MSEFlags2, MSEHasFallDirection,
MSEGuidByte3,
MSEGuidByte2, MSEGuidByte2,
MSEGuidByte3,
MSEGuidByte6, MSEGuidByte6,
MSEGuidByte4, MSEMovementCounter,
MSEGuidByte0, MSEGuidByte0,
MSEGuidByte5,
MSEGuidByte4,
MSEGuidByte7, MSEGuidByte7,
MSEGuidByte1, MSEGuidByte1,
MSEGuidByte5, MSETransportTime,
MSESplineElevation, MSETransportTime3,
MSETransportPositionY,
MSETransportPositionX, MSETransportPositionX,
MSETransportGuidByte5, MSETransportTime2,
MSETransportSeat, MSETransportGuidByte4,
MSETransportGuidByte2,
MSETransportGuidByte3, MSETransportGuidByte3,
MSETransportPositionO, MSETransportPositionO,
MSETransportTime2,
MSETransportTime3,
MSETransportGuidByte7,
MSETransportGuidByte1,
MSETransportGuidByte0, MSETransportGuidByte0,
MSETransportGuidByte4,
MSETransportPositionY,
MSETransportPositionZ, MSETransportPositionZ,
MSETransportTime,
MSETransportGuidByte6, MSETransportGuidByte6,
MSEFallTime, MSETransportGuidByte7,
MSEFallHorizontalSpeed, MSETransportGuidByte5,
MSEFallCosAngle, MSETransportGuidByte1,
MSEFallSinAngle, MSETransportGuidByte2,
MSEFallVerticalSpeed,
MSETimestamp,
MSEPitch,
MSEPositionO, MSEPositionO,
MSETimestamp,
MSEFallSinAngle,
MSEFallCosAngle,
MSEFallHorizontalSpeed,
MSEFallVerticalSpeed,
MSEFallTime,
MSEUnkTime,
MSESplineElevation,
MSEPitch,
MSEEnd, MSEEnd,
}; };
@ -2649,11 +2660,11 @@ MovementStatusElements* GetMovementStatusElementsSequence(uint16 opcode)
return MovementStartTurnLeftSequence; return MovementStartTurnLeftSequence;
case MSG_MOVE_START_TURN_RIGHT: // 5.4.8 case MSG_MOVE_START_TURN_RIGHT: // 5.4.8
return MovementStartTurnRightSequence; return MovementStartTurnRightSequence;
case CMSG_MOVE_STOP: case MSG_MOVE_STOP: // 5.4.8
return MovementStopSequence; return MovementStopSequence;
case CMSG_MOVE_STOP_STRAFE: case MSG_MOVE_STOP_STRAFE: // 5.4.8
return MovementStopStrafeSequence; return MovementStopStrafeSequence;
case CMSG_MOVE_STOP_TURN: case MSG_MOVE_STOP_TURN: // 5.4.8
return MovementStopTurnSequence; return MovementStopTurnSequence;
case CMSG_MOVE_START_ASCEND: case CMSG_MOVE_START_ASCEND:
return MovementStartAscendSequence; return MovementStartAscendSequence;