aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/game/Movement/MovementStructures.h386
-rw-r--r--src/server/game/Server/Protocol/Opcodes.cpp6
2 files changed, 196 insertions, 196 deletions
diff --git a/src/server/game/Movement/MovementStructures.h b/src/server/game/Movement/MovementStructures.h
index 3992858ceac..45406cb732d 100644
--- a/src/server/game/Movement/MovementStructures.h
+++ b/src/server/game/Movement/MovementStructures.h
@@ -274,76 +274,76 @@ MovementStatusElements MovementHeartBeatSequence[] = {
MSEPitch,
MSEFallTime,
MSEFallVerticalSpeed,
+ MSEFallHorizontalSpeed,
MSEFallSinAngle,
MSEFallCosAngle,
- MSEFallHorizontalSpeed,
MSEGuidByte2_2,
MSEGuidByte0_2,
};
-
+//4.2.2
MovementStatusElements MovementJumpSequence[] = {
- MSEGuidByte5,
+ MSEHaveSpline,
+ MSEGuidByte0,
MSEGuidByte1,
- MSEGuidByte6,
+ MSEGuidByte4,
MSEFlags,
MSEGuidByte2,
- MSEHaveSpline,
+ MSEGuidByte5,
MSEGuidByte3,
MSEFlags2,
- MSEGuidByte4,
- MSEGuidByte0,
MSEGuidByte7,
- MSEHaveFallData,
- MSEHaveFallDirection,
+ MSEGuidByte6,
+ MSEHaveSplineElev,
MSEHaveTransportData,
- MSETransportGuidByte6,
- MSETransportGuidByte3,
- MSETransportGuidByte7,
- MSETransportGuidByte4,
- MSETransportGuidByte1,
MSETransportGuidByte0,
+ MSETransportGuidByte6,
MSETransportGuidByte2,
MSETransportGuidByte5,
- MSETransportHaveTime3,
+ MSETransportGuidByte4,
+ MSETransportGuidByte1,
+ MSETransportGuidByte3,
+ MSETransportGuidByte7,
MSETransportHaveTime2,
- MSEHaveSplineElev,
+ MSETransportHaveTime3,
+ MSEHaveFallData,
+ MSEHaveFallDirection,
MSEHavePitch,
MSEPositionO,
+ MSETimestamp,
MSEPositionX,
MSEPositionY,
MSEPositionZ,
- MSETimestamp,
- MSEGuidByte1_2,
- MSEFallVerticalSpeed,
- MSEFallTime,
- MSEFallHorizontalSpeed,
- MSEFallCosAngle,
- MSEFallSinAngle,
- MSETransportTime,
+ MSESplineElev,
+ MSEGuidByte0_2,
+ MSEGuidByte5_2,
+ MSEGuidByte3_2,
+ MSETransportSeat,
+ MSETransportPositionO,
MSETransportPositionX,
MSETransportPositionY,
MSETransportPositionZ,
- MSETransportPositionO,
- MSETransportSeat,
+ MSETransportTime,
+ MSETransportTime2,
MSETransportGuidByte3_2,
- MSETransportGuidByte1_2,
- MSETransportTime3,
MSETransportGuidByte6_2,
- MSETransportGuidByte0_2,
- MSETransportGuidByte5_2,
- MSETransportTime2,
+ MSETransportTime3,
MSETransportGuidByte7_2,
- MSETransportGuidByte4_2,
+ MSETransportGuidByte5_2,
MSETransportGuidByte2_2,
- MSEGuidByte6_2,
+ MSETransportGuidByte1_2,
+ MSETransportGuidByte0_2,
+ MSETransportGuidByte4_2,
MSEGuidByte4_2,
- MSESplineElev,
- MSEGuidByte0_2,
- MSEPitch,
- MSEGuidByte5_2,
- MSEGuidByte3_2,
- MSEGuidByte7_2,
+ MSEGuidByte1_2,
+ MSEFallTime,
+ MSEFallVerticalSpeed,
+ MSEFallHorizontalSpeed,
+ MSEFallSinAngle,
+ MSEFallCosAngle,
MSEGuidByte2_2,
+ MSEGuidByte6_2,
+ MSEGuidByte7_2,
+ MSEPitch,
};
//4.2.2
MovementStatusElements MovementSetFacingSequence[] = {
@@ -410,200 +410,200 @@ MovementStatusElements MovementSetFacingSequence[] = {
MSETransportGuidByte4_2,
MSEGuidByte3_2,
};
-
+//4.2.2
MovementStatusElements MovementSetPitchSequence[] = {
- MSEGuidByte4,
- MSEGuidByte6,
- MSEGuidByte2,
- MSEFlags2,
MSEGuidByte1,
+ MSEGuidByte6,
MSEGuidByte7,
- MSEGuidByte5,
MSEGuidByte3,
- MSEHaveSpline,
- MSEGuidByte0,
MSEFlags,
- MSEHaveFallData,
- MSEHaveFallDirection,
+ MSEGuidByte5,
+ MSEGuidByte2,
+ MSEGuidByte0,
+ MSEHaveSpline,
+ MSEGuidByte4,
+ MSEFlags2,
+ MSEHaveSplineElev,
MSEHaveTransportData,
- MSETransportGuidByte6,
- MSETransportGuidByte3,
- MSETransportGuidByte7,
- MSETransportGuidByte4,
- MSETransportGuidByte1,
MSETransportGuidByte0,
+ MSETransportGuidByte6,
MSETransportGuidByte2,
MSETransportGuidByte5,
- MSETransportHaveTime3,
+ MSETransportGuidByte4,
+ MSETransportGuidByte1,
+ MSETransportGuidByte3,
+ MSETransportGuidByte7,
MSETransportHaveTime2,
- MSEHaveSplineElev,
+ MSETransportHaveTime3,
MSEHavePitch,
- MSEPositionO,
- MSETimestamp,
+ MSEHaveFallData,
+ MSEHaveFallDirection,
MSEPositionX,
MSEPositionY,
MSEPositionZ,
- MSEGuidByte2_2,
- MSEGuidByte6_2,
- MSEGuidByte5_2,
- MSEFallVerticalSpeed,
- MSEFallTime,
- MSEFallHorizontalSpeed,
- MSEFallCosAngle,
- MSEFallSinAngle,
- MSEGuidByte3_2,
- MSETransportTime,
+ MSETimestamp,
+ MSEPositionO,
+ MSEGuidByte1_2,
+ MSEGuidByte4_2,
+ MSESplineElev,
+ MSETransportSeat,
+ MSETransportPositionO,
MSETransportPositionX,
MSETransportPositionY,
MSETransportPositionZ,
- MSETransportPositionO,
- MSETransportSeat,
+ MSETransportTime,
+ MSETransportTime2,
MSETransportGuidByte3_2,
- MSETransportGuidByte1_2,
- MSETransportTime3,
MSETransportGuidByte6_2,
- MSETransportGuidByte0_2,
- MSETransportGuidByte5_2,
- MSETransportTime2,
+ MSETransportTime3,
MSETransportGuidByte7_2,
- MSETransportGuidByte4_2,
+ MSETransportGuidByte5_2,
MSETransportGuidByte2_2,
+ MSETransportGuidByte1_2,
+ MSETransportGuidByte0_2,
+ MSETransportGuidByte4_2,
+ MSEPitch,
+ MSEGuidByte5_2,
+ MSEFallTime,
+ MSEFallVerticalSpeed,
+ MSEFallHorizontalSpeed,
+ MSEFallSinAngle,
+ MSEFallCosAngle,
MSEGuidByte0_2,
- MSEGuidByte1_2,
- MSESplineElev,
+ MSEGuidByte3_2,
+ MSEGuidByte6_2,
MSEGuidByte7_2,
- MSEGuidByte4_2,
- MSEPitch,
+ MSEGuidByte2_2,
};
-
+//4.2.2
MovementStatusElements MovementStartBackwardSequence[] = {
- MSEGuidByte4,
- MSEGuidByte1,
MSEGuidByte5,
MSEFlags2,
- MSEGuidByte3,
- MSEGuidByte6,
- MSEGuidByte0,
MSEGuidByte2,
MSEGuidByte7,
- MSEFlags,
MSEHaveSpline,
- MSEHaveFallData,
- MSEHaveFallDirection,
+ MSEFlags,
+ MSEGuidByte1,
+ MSEGuidByte3,
+ MSEGuidByte4,
+ MSEGuidByte6,
+ MSEGuidByte0,
+ MSEHaveSplineElev,
+ MSEHavePitch,
MSEHaveTransportData,
- MSETransportGuidByte6,
- MSETransportGuidByte3,
- MSETransportGuidByte7,
- MSETransportGuidByte4,
- MSETransportGuidByte1,
MSETransportGuidByte0,
+ MSETransportGuidByte6,
MSETransportGuidByte2,
MSETransportGuidByte5,
- MSETransportHaveTime3,
+ MSETransportGuidByte4,
+ MSETransportGuidByte1,
+ MSETransportGuidByte3,
+ MSETransportGuidByte7,
MSETransportHaveTime2,
- MSEHavePitch,
- MSEHaveSplineElev,
+ MSETransportHaveTime3,
+ MSEHaveFallData,
+ MSEHaveFallDirection,
+ MSEPositionO,
MSEPositionX,
MSEPositionY,
MSEPositionZ,
MSETimestamp,
- MSEPositionO,
+ MSEGuidByte3_2,
MSEGuidByte0_2,
- MSEGuidByte5_2,
- MSEFallVerticalSpeed,
- MSEFallTime,
- MSEFallHorizontalSpeed,
- MSEFallCosAngle,
- MSEFallSinAngle,
+ MSEGuidByte1_2,
+ MSESplineElev,
MSEGuidByte4_2,
+ MSEPitch,
+ MSEGuidByte7_2,
MSEGuidByte2_2,
- MSETransportTime,
+ MSEGuidByte6_2,
+ MSETransportSeat,
+ MSETransportPositionO,
MSETransportPositionX,
MSETransportPositionY,
MSETransportPositionZ,
- MSETransportPositionO,
- MSETransportSeat,
+ MSETransportTime,
+ MSETransportTime2,
MSETransportGuidByte3_2,
- MSETransportGuidByte1_2,
- MSETransportTime3,
MSETransportGuidByte6_2,
- MSETransportGuidByte0_2,
- MSETransportGuidByte5_2,
- MSETransportTime2,
+ MSETransportTime3,
MSETransportGuidByte7_2,
- MSETransportGuidByte4_2,
+ MSETransportGuidByte5_2,
MSETransportGuidByte2_2,
- MSEGuidByte6_2,
- MSEPitch,
- MSEGuidByte3_2,
- MSESplineElev,
- MSEGuidByte1_2,
- MSEGuidByte7_2,
+ MSETransportGuidByte1_2,
+ MSETransportGuidByte0_2,
+ MSETransportGuidByte4_2,
+ MSEGuidByte5_2,
+ MSEFallTime,
+ MSEFallVerticalSpeed,
+ MSEFallHorizontalSpeed,
+ MSEFallSinAngle,
+ MSEFallCosAngle,
};
-
+//4.2.2
MovementStatusElements MovementStartForwardSequence[] = {
- MSEGuidByte0,
- MSEHaveSpline,
+ MSEFlags,
+ MSEGuidByte1,
+ MSEGuidByte7,
+ MSEFlags2,
+ MSEGuidByte6,
MSEGuidByte5,
+ MSEHaveSpline,
+ MSEGuidByte0,
MSEGuidByte3,
MSEGuidByte4,
MSEGuidByte2,
- MSEGuidByte7,
- MSEFlags2,
- MSEFlags,
- MSEGuidByte6,
- MSEGuidByte1,
- MSEHavePitch,
MSEHaveFallData,
MSEHaveFallDirection,
+ MSEHaveSplineElev,
MSEHaveTransportData,
- MSETransportGuidByte6,
- MSETransportGuidByte3,
- MSETransportGuidByte7,
- MSETransportGuidByte4,
- MSETransportGuidByte1,
MSETransportGuidByte0,
+ MSETransportGuidByte6,
MSETransportGuidByte2,
MSETransportGuidByte5,
- MSETransportHaveTime3,
+ MSETransportGuidByte4,
+ MSETransportGuidByte1,
+ MSETransportGuidByte3,
+ MSETransportGuidByte7,
MSETransportHaveTime2,
- MSEHaveSplineElev,
- MSETimestamp,
+ MSETransportHaveTime3,
+ MSEHavePitch,
MSEPositionX,
MSEPositionY,
MSEPositionZ,
+ MSETimestamp,
MSEPositionO,
- MSEGuidByte7_2,
- MSEPitch,
- MSEGuidByte1_2,
MSEGuidByte2_2,
- MSEFallVerticalSpeed,
+ MSEGuidByte3_2,
MSEFallTime,
MSEFallHorizontalSpeed,
- MSEFallCosAngle,
MSEFallSinAngle,
- MSEGuidByte3_2,
- MSEGuidByte5_2,
- MSEGuidByte0_2,
+ MSEFallCosAngle,
+ MSEFallVerticalSpeed,
+ MSESplineElev,
MSEGuidByte6_2,
- MSETransportTime,
+ MSEGuidByte0_2,
+ MSEGuidByte1_2,
+ MSEGuidByte7_2,
+ MSETransportSeat,
+ MSETransportPositionO,
MSETransportPositionX,
MSETransportPositionY,
MSETransportPositionZ,
- MSETransportPositionO,
- MSETransportSeat,
+ MSETransportTime,
+ MSETransportTime2,
MSETransportGuidByte3_2,
- MSETransportGuidByte1_2,
- MSETransportTime3,
MSETransportGuidByte6_2,
- MSETransportGuidByte0_2,
- MSETransportGuidByte5_2,
- MSETransportTime2,
+ MSETransportTime3,
MSETransportGuidByte7_2,
- MSETransportGuidByte4_2,
+ MSETransportGuidByte5_2,
MSETransportGuidByte2_2,
+ MSETransportGuidByte1_2,
+ MSETransportGuidByte0_2,
+ MSETransportGuidByte4_2,
+ MSEGuidByte5_2,
MSEGuidByte4_2,
- MSESplineElev,
+ MSEPitch,
};
MovementStatusElements MovementStartStrafeLeftSequence[] = {
@@ -865,70 +865,70 @@ MovementStatusElements MovementStartTurnRightSequence[] = {
MSETransportGuidByte4_2,
MSETransportGuidByte2_2,
};
-
+//4.2.2
MovementStatusElements MovementStopSequence[] = {
+ MSEGuidByte2,
+ MSEGuidByte0,
+ MSEHaveSpline,
+ MSEFlags,
MSEGuidByte4,
+ MSEGuidByte6,
MSEGuidByte3,
- MSEFlags,
MSEGuidByte5,
- MSEGuidByte6,
- MSEGuidByte0,
- MSEGuidByte1,
- MSEGuidByte2,
MSEGuidByte7,
- MSEHaveSpline,
MSEFlags2,
+ MSEGuidByte1,
MSEHavePitch,
- MSEHaveSplineElev,
MSEHaveFallData,
MSEHaveFallDirection,
MSEHaveTransportData,
- MSETransportGuidByte6,
- MSETransportGuidByte3,
- MSETransportGuidByte7,
- MSETransportGuidByte4,
- MSETransportGuidByte1,
MSETransportGuidByte0,
+ MSETransportGuidByte6,
MSETransportGuidByte2,
MSETransportGuidByte5,
- MSETransportHaveTime3,
+ MSETransportGuidByte4,
+ MSETransportGuidByte1,
+ MSETransportGuidByte3,
+ MSETransportGuidByte7,
MSETransportHaveTime2,
+ MSETransportHaveTime3,
+ MSEHaveSplineElev,
+ MSEPositionO,
MSETimestamp,
MSEPositionX,
MSEPositionY,
MSEPositionZ,
- MSEPositionO,
- MSEGuidByte6_2,
- MSEGuidByte5_2,
- MSEGuidByte1_2,
+ MSEGuidByte2_2,
MSEGuidByte3_2,
MSEPitch,
- MSEGuidByte2_2,
- MSESplineElev,
- MSEGuidByte4_2,
- MSEGuidByte0_2,
- MSEGuidByte7_2,
- MSEFallVerticalSpeed,
MSEFallTime,
MSEFallHorizontalSpeed,
- MSEFallCosAngle,
MSEFallSinAngle,
- MSETransportTime,
+ MSEFallCosAngle,
+ MSEFallVerticalSpeed,
+ MSEGuidByte5_2,
+ MSEGuidByte7_2,
+ MSETransportSeat,
+ MSETransportPositionO,
MSETransportPositionX,
MSETransportPositionY,
MSETransportPositionZ,
- MSETransportPositionO,
- MSETransportSeat,
+ MSETransportTime,
+ MSETransportTime2,
MSETransportGuidByte3_2,
- MSETransportGuidByte1_2,
- MSETransportTime3,
MSETransportGuidByte6_2,
- MSETransportGuidByte0_2,
- MSETransportGuidByte5_2,
- MSETransportTime2,
+ MSETransportTime3,
MSETransportGuidByte7_2,
- MSETransportGuidByte4_2,
+ MSETransportGuidByte5_2,
MSETransportGuidByte2_2,
+ MSETransportGuidByte1_2,
+ MSETransportGuidByte0_2,
+ MSETransportGuidByte4_2,
+ MSEGuidByte1_2,
+ MSEGuidByte0_2,
+ MSESplineElev,
+ MSEGuidByte6_2,
+ MSEGuidByte4_2,
};
MovementStatusElements MovementStopStrafeSequence[] = {
@@ -1331,15 +1331,15 @@ MovementStatusElements* GetMovementStatusElementsSequence(Opcodes opcode)
return MovementFallLandSequence;
case MSG_MOVE_HEARTBEAT://done
return MovementHeartBeatSequence;
- case MSG_MOVE_JUMP:
+ case MSG_MOVE_JUMP://done
return MovementJumpSequence;
case MSG_MOVE_SET_FACING://done
return MovementSetFacingSequence;
- case MSG_MOVE_SET_PITCH:
+ case MSG_MOVE_SET_PITCH://done
return MovementSetPitchSequence;
- case MSG_MOVE_START_BACKWARD:
+ case MSG_MOVE_START_BACKWARD://done
return MovementStartBackwardSequence;
- case MSG_MOVE_START_FORWARD:
+ case MSG_MOVE_START_FORWARD://done
return MovementStartForwardSequence;
case MSG_MOVE_START_STRAFE_LEFT:
return MovementStartStrafeLeftSequence;
@@ -1349,7 +1349,7 @@ MovementStatusElements* GetMovementStatusElementsSequence(Opcodes opcode)
return MovementStartTurnLeftSequence;
case MSG_MOVE_START_TURN_RIGHT:
return MovementStartTurnRightSequence;
- case MSG_MOVE_STOP:
+ case MSG_MOVE_STOP://done
return MovementStopSequence;
case MSG_MOVE_STOP_STRAFE:
return MovementStopStrafeSequence;
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 11edcdc77f7..63ffde54a10 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -342,7 +342,7 @@ void InitOpcodes()
DEFINE_OPCODE_HANDLER(CMSG_INSPECT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleInspectOpcode );
//DEFINE_OPCODE_HANDLER(SMSG_INSPECT_RESULTS_UPDATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(CMSG_INITIATE_TRADE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleInitiateTradeOpcode );
- //DEFINE_OPCODE_HANDLER(CMSG_BEGIN_TRADE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBeginTradeOpcode );
+ DEFINE_OPCODE_HANDLER(CMSG_BEGIN_TRADE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBeginTradeOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_BUSY_TRADE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBusyTradeOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_IGNORE_TRADE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleIgnoreTradeOpcode );
DEFINE_OPCODE_HANDLER(CMSG_ACCEPT_TRADE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAcceptTradeOpcode );
@@ -912,8 +912,8 @@ void InitOpcodes()
DEFINE_OPCODE_HANDLER(SMSG_ARENA_TEAM_ROSTER, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(CMSG_ARENA_TEAM_INVITE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamInviteOpcode );
//DEFINE_OPCODE_HANDLER(SMSG_ARENA_TEAM_INVITE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
- //DEFINE_OPCODE_HANDLER(CMSG_ARENA_TEAM_ACCEPT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamAcceptOpcode );
- //DEFINE_OPCODE_HANDLER(CMSG_ARENA_TEAM_DECLINE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamDeclineOpcode );
+ DEFINE_OPCODE_HANDLER(CMSG_ARENA_TEAM_ACCEPT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamAcceptOpcode );
+ DEFINE_OPCODE_HANDLER(CMSG_ARENA_TEAM_DECLINE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamDeclineOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_ARENA_TEAM_LEAVE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamLeaveOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_ARENA_TEAM_REMOVE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamRemoveOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_ARENA_TEAM_DISBAND, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleArenaTeamDisbandOpcode );