Core/Movement: Fixed some movement structures, added SMSG_PLAYER_MOVE

This commit is contained in:
Rat
2012-01-01 22:30:37 +01:00
parent 8816b00be7
commit bff7c18251
3 changed files with 128 additions and 131 deletions
+126 -130
View File
@@ -85,70 +85,70 @@ enum MovementStatusElements
MSETransportTime3,
MSE_COUNT
};
//4.2.2
MovementStatusElements PlayerMoveSequence[] = {
MSEHaveSplineElev,
MSEHaveTransportData,
MSEGuidByte5,
MSETransportGuidByte0,
MSETransportGuidByte2,
MSETransportGuidByte4,
MSETransportGuidByte1,
MSETransportGuidByte3,
MSETransportHaveTime2,
MSETransportGuidByte7,
MSETransportHaveTime3,
MSETransportGuidByte6,
MSETransportGuidByte5,
MSEGuidByte7,
MSEGuidByte3,
MSEGuidByte1,
MSEGuidByte4,
MSEGuidByte0,
MSEFlags,
MSEHavePitch,
MSEGuidByte2,
MSEFlags2,
MSEGuidByte6,
MSEHaveFallData,
MSEHaveFallDirection,
MSEGuidByte1,
MSEGuidByte2,
MSEFlags2,
MSEGuidByte0,
MSEHaveTransportData,
MSETransportGuidByte1,
MSETransportGuidByte4,
MSETransportGuidByte0,
MSETransportHaveTime2,
MSETransportGuidByte6,
MSETransportGuidByte3,
MSETransportGuidByte2,
MSETransportGuidByte7,
MSETransportHaveTime3,
MSETransportGuidByte5,
MSEGuidByte3,
MSEGuidByte4,
MSEGuidByte5,
MSEHaveSpline,
MSEGuidByte7,
MSEHaveSplineElev,
MSEFlags,
MSEPositionO,
MSEGuidByte0_2,
MSEPitch,
MSEGuidByte4_2,
MSEFallTime,
MSEFallHorizontalSpeed,
MSEFallCosAngle,
MSEFallSinAngle,
MSEFallVerticalSpeed,
MSETimestamp,
MSEGuidByte1_2,
MSETransportGuidByte7_2,
MSETransportGuidByte3_2,
MSETransportGuidByte1_2,
MSEGuidByte0_2,
MSEPositionO,
MSEGuidByte6_2,
MSEGuidByte7_2,
MSESplineElev,
MSETransportGuidByte4_2,
MSETransportGuidByte2_2,
MSETransportPositionO,
MSETransportTime,
MSETransportSeat,
MSETransportTime2,
MSETransportGuidByte0_2,
MSETransportGuidByte6_2,
MSETransportGuidByte3_2,
MSETransportPositionX,
MSETransportPositionY,
MSETransportPositionZ,
MSETransportGuidByte4_2,
MSETransportPositionO,
MSETransportGuidByte1_2,
MSETransportTime2,
MSETransportTime3,
MSETransportGuidByte5_2,
MSETransportTime,
MSETransportGuidByte2_2,
MSETransportGuidByte0_2,
MSETransportGuidByte6_2,
MSETransportGuidByte7_2,
MSEGuidByte2_2,
MSETimestamp,
MSEGuidByte1_2,
MSEPitch,
MSEPositionX,
MSEPositionY,
MSEPositionZ,
MSEGuidByte6_2,
MSESplineElev,
MSEGuidByte5_2,
MSEGuidByte3_2,
MSEGuidByte7_2
MSEFallSinAngle,
MSEFallCosAngle,
MSEFallVerticalSpeed,
MSEFallHorizontalSpeed,
MSEFallTime,
};
MovementStatusElements MovementFallLandSequence[] = {
@@ -215,74 +215,70 @@ MovementStatusElements MovementFallLandSequence[] = {
MSEGuidByte6_2,
MSEGuidByte4_2,
};
//4.2.2
MovementStatusElements MovementHeartBeatSequence[] = {
/*
3bits
8bits
*/
MSEGuidByte1,
MSEGuidByte5,
MSEGuidByte2,
MSEFlags2,
MSEGuidByte3,
MSEGuidByte4,
MSEHaveSpline,
MSEFlags,
MSEHaveSpline,
MSEGuidByte0,
MSEGuidByte6,
MSEGuidByte1,
MSEGuidByte7,
MSEGuidByte2,
MSEGuidByte4,
MSEGuidByte3,
MSEFlags2,
MSEGuidByte5,
MSEHaveSplineElev,
MSEHaveTransportData,
MSETransportGuidByte6,
MSETransportGuidByte3,
MSETransportGuidByte7,
MSETransportGuidByte4,
MSETransportGuidByte1,
MSETransportGuidByte0,
MSETransportGuidByte6,
MSETransportGuidByte2,
MSETransportGuidByte5,
MSETransportHaveTime3,
MSETransportGuidByte4,
MSETransportGuidByte1,
MSETransportGuidByte3,
MSETransportGuidByte7,
MSETransportHaveTime2,
MSETransportHaveTime3,
MSEHavePitch,
MSEHaveSplineElev,
MSEHaveFallData,
MSEHaveFallDirection,
MSEPositionO,
MSETimestamp,
MSEPositionX,
MSEPositionY,
MSEPositionZ,
MSETimestamp,
MSEPositionO,
MSEGuidByte7_2,
MSEGuidByte5_2,
MSESplineElev,
MSEGuidByte1_2,
MSEGuidByte6_2,
MSETransportTime,
MSEGuidByte4_2,
MSEGuidByte3_2,
MSETransportSeat,
MSETransportPositionO,
MSETransportPositionX,
MSETransportPositionY,
MSETransportPositionZ,
MSETransportPositionO,
MSETransportSeat,
MSETransportGuidByte3_2,
MSETransportGuidByte1_2,
MSETransportTime3,
MSETransportGuidByte6_2,
MSETransportGuidByte0_2,
MSETransportGuidByte5_2,
MSETransportTime,
MSETransportTime2,
MSETransportGuidByte3_2,
MSETransportGuidByte6_2,
MSETransportTime3,
MSETransportGuidByte7_2,
MSETransportGuidByte4_2,
MSETransportGuidByte5_2,
MSETransportGuidByte2_2,
MSETransportGuidByte1_2,
MSETransportGuidByte0_2,
MSETransportGuidByte4_2,
MSEPitch,
MSESplineElev,
MSEFallVerticalSpeed,
MSEFallTime,
MSEFallHorizontalSpeed,
MSEFallCosAngle,
MSEFallVerticalSpeed,
MSEFallSinAngle,
MSEGuidByte5_2,
MSEGuidByte1_2,
MSEGuidByte7_2,
MSEGuidByte0_2,
MSEFallCosAngle,
MSEFallHorizontalSpeed,
MSEGuidByte2_2,
MSEGuidByte4_2,
MSEGuidByte3_2,
MSEGuidByte0_2,
};
MovementStatusElements MovementJumpSequence[] = {
@@ -349,70 +345,70 @@ MovementStatusElements MovementJumpSequence[] = {
MSEGuidByte7_2,
MSEGuidByte2_2,
};
//4.2.2
MovementStatusElements MovementSetFacingSequence[] = {
MSEFlags,
MSEGuidByte4,
MSEGuidByte2,
MSEHaveSpline,
MSEGuidByte3,
MSEGuidByte1,
MSEGuidByte5,
MSEFlags2,
MSEGuidByte0,
MSEGuidByte7,
MSEFlags2,
MSEHaveSpline,
MSEGuidByte4,
MSEFlags,
MSEGuidByte6,
MSEGuidByte5,
MSEGuidByte2,
MSEGuidByte1,
MSEHaveSplineElev,
MSEHavePitch,
MSEHaveFallData,
MSEHaveFallDirection,
MSEHaveTransportData,
MSETransportGuidByte6,
MSETransportGuidByte3,
MSETransportGuidByte7,
MSETransportGuidByte4,
MSETransportGuidByte1,
MSETransportGuidByte0,
MSETransportGuidByte6,
MSETransportGuidByte2,
MSETransportGuidByte5,
MSETransportHaveTime3,
MSETransportGuidByte4,
MSETransportGuidByte1,
MSETransportGuidByte3,
MSETransportGuidByte7,
MSETransportHaveTime2,
MSEHavePitch,
MSEHaveSplineElev,
MSETransportHaveTime3,
MSEPositionO,
MSETimestamp,
MSEPositionX,
MSEPositionY,
MSEPositionZ,
MSEPositionO,
MSETimestamp,
MSEFallVerticalSpeed,
MSEFallTime,
MSEFallHorizontalSpeed,
MSEFallCosAngle,
MSEFallSinAngle,
MSEGuidByte2_2,
MSEGuidByte7_2,
MSEGuidByte5_2,
MSESplineElev,
MSEGuidByte4_2,
MSETransportTime,
MSEGuidByte1_2,
MSEGuidByte2_2,
MSEPitch,
MSEFallTime,
MSEFallVerticalSpeed,
MSEFallSinAngle,
MSEFallCosAngle,
MSEFallHorizontalSpeed,
MSEGuidByte6_2,
MSEGuidByte0_2,
MSETransportSeat,
MSETransportPositionO,
MSETransportPositionX,
MSETransportPositionY,
MSETransportPositionZ,
MSETransportPositionO,
MSETransportSeat,
MSETransportGuidByte3_2,
MSETransportGuidByte1_2,
MSETransportTime3,
MSETransportGuidByte6_2,
MSETransportGuidByte0_2,
MSETransportGuidByte5_2,
MSETransportTime,
MSETransportTime2,
MSETransportGuidByte3_2,
MSETransportGuidByte6_2,
MSETransportTime3,
MSETransportGuidByte7_2,
MSETransportGuidByte4_2,
MSETransportGuidByte5_2,
MSETransportGuidByte2_2,
MSETransportGuidByte1_2,
MSETransportGuidByte0_2,
MSETransportGuidByte4_2,
MSEGuidByte3_2,
MSEGuidByte7_2,
MSEPitch,
MSEGuidByte5_2,
MSEGuidByte1_2,
MSEGuidByte6_2,
MSESplineElev,
MSEGuidByte0_2,
};
MovementStatusElements MovementSetPitchSequence[] = {
@@ -1329,15 +1325,15 @@ MovementStatusElements* GetMovementStatusElementsSequence(Opcodes opcode)
{
switch(opcode)
{
case SMSG_PLAYER_MOVE:
case SMSG_PLAYER_MOVE://done
return PlayerMoveSequence;
case MSG_MOVE_FALL_LAND:
return MovementFallLandSequence;
case MSG_MOVE_HEARTBEAT:
case MSG_MOVE_HEARTBEAT://done
return MovementHeartBeatSequence;
case MSG_MOVE_JUMP:
return MovementJumpSequence;
case MSG_MOVE_SET_FACING:
case MSG_MOVE_SET_FACING://done
return MovementSetFacingSequence;
case MSG_MOVE_SET_PITCH:
return MovementSetPitchSequence;
@@ -1381,6 +1381,7 @@ void InitOpcodes()
DEFINE_OPCODE_HANDLER(CMSG_RETURN_TO_GRAVEYARD, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleReturnToGraveyard );
DEFINE_OPCODE_HANDLER(CMSG_RANDOMIZE_CHAR_NAME, STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleRandomizeCharNameOpcode );
DEFINE_OPCODE_HANDLER(SMSG_RANDOMIZE_CHAR_NAME, STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_PLAYER_MOVE, STATUS_AUTHED, PROCESS_THREADSAFE, &WorldSession::Handle_ServerSide );
#undef DEFINE_OPCODE_HANDLER
};
+1 -1
View File
@@ -872,7 +872,7 @@ enum Opcodes
SMSG_PETITION_SHOWLIST = 0x8ED7,
SMSG_PETITION_SHOW_SIGNATURES = 0x4E4A,
SMSG_PETITION_SIGN_RESULTS = 0x5EE6,
SMSG_PLAYER_MOVE = 0x00,
SMSG_PLAYER_MOVE = 0xF66C,
SMSG_PLAYED_TIME = 0x187F,
SMSG_PLAYERBINDERROR = 0x5A4F,
SMSG_PLAYERBOUND = 0x00,