diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Movement/MovementStructures.h | 624 | ||||
| -rwxr-xr-x | src/server/game/Server/WorldSession.cpp | 6 | ||||
| -rwxr-xr-x | src/server/shared/Packets/ByteBuffer.h | 2 |
3 files changed, 316 insertions, 316 deletions
diff --git a/src/server/game/Movement/MovementStructures.h b/src/server/game/Movement/MovementStructures.h index 49ab6369fc7..9f8a5108e46 100644 --- a/src/server/game/Movement/MovementStructures.h +++ b/src/server/game/Movement/MovementStructures.h @@ -145,8 +145,8 @@ MovementStatusElements PlayerMoveSequence[] = { MSEGuidByte5_2, MSEGuidByte3_2, MSEFallHorizontalSpeed, - MSEFallSinAngle, MSEFallCosAngle, + MSEFallSinAngle, MSEFallVerticalSpeed, MSEFallTime, }; @@ -188,8 +188,8 @@ MovementStatusElements MovementFallLandSequence[] = { MSEFallTime, MSEFallVerticalSpeed, MSEFallHorizontalSpeed, - MSEFallSinAngle, MSEFallCosAngle, + MSEFallSinAngle, MSEGuidByte0_2, MSEPitch, MSEGuidByte4_2, @@ -275,8 +275,8 @@ MovementStatusElements MovementHeartBeatSequence[] = { MSEFallTime, MSEFallVerticalSpeed, MSEFallHorizontalSpeed, - MSEFallSinAngle, MSEFallCosAngle, + MSEFallSinAngle, MSEGuidByte2_2, MSEGuidByte0_2, }; @@ -338,8 +338,8 @@ MovementStatusElements MovementJumpSequence[] = { MSEFallTime, MSEFallVerticalSpeed, MSEFallHorizontalSpeed, - MSEFallSinAngle, MSEFallCosAngle, + MSEFallSinAngle, MSEGuidByte2_2, MSEGuidByte6_2, MSEGuidByte7_2, @@ -387,9 +387,9 @@ MovementStatusElements MovementSetFacingSequence[] = { MSEPitch, MSEFallTime, MSEFallVerticalSpeed, - MSEFallSinAngle, - MSEFallCosAngle, MSEFallHorizontalSpeed, + MSEFallCosAngle, + MSEFallSinAngle, MSEGuidByte6_2, MSEGuidByte0_2, MSETransportSeat, @@ -467,8 +467,8 @@ MovementStatusElements MovementSetPitchSequence[] = { MSEFallTime, MSEFallVerticalSpeed, MSEFallHorizontalSpeed, - MSEFallSinAngle, MSEFallCosAngle, + MSEFallSinAngle, MSEGuidByte0_2, MSEGuidByte3_2, MSEGuidByte6_2, @@ -537,8 +537,8 @@ MovementStatusElements MovementStartBackwardSequence[] = { MSEFallTime, MSEFallVerticalSpeed, MSEFallHorizontalSpeed, - MSEFallSinAngle, MSEFallCosAngle, + MSEFallSinAngle, }; //4.2.2 MovementStatusElements MovementStartForwardSequence[] = { @@ -576,10 +576,10 @@ MovementStatusElements MovementStartForwardSequence[] = { MSEGuidByte2_2, MSEGuidByte3_2, MSEFallTime, + MSEFallVerticalSpeed, MSEFallHorizontalSpeed, - MSEFallSinAngle, MSEFallCosAngle, - MSEFallVerticalSpeed, + MSEFallSinAngle, MSESplineElev, MSEGuidByte6_2, MSEGuidByte0_2, @@ -645,8 +645,8 @@ MovementStatusElements MovementStartStrafeLeftSequence[] = { MSEFallTime, MSEFallVerticalSpeed, MSEFallHorizontalSpeed, - MSEFallSinAngle, MSEFallCosAngle, + MSEFallSinAngle, MSEGuidByte4_2, MSEGuidByte3_2, MSEGuidByte2_2, @@ -670,200 +670,200 @@ MovementStatusElements MovementStartStrafeLeftSequence[] = { MSETransportGuidByte0_2, MSETransportGuidByte4_2, }; - +//4.2.2 MovementStatusElements MovementStartStrafeRightSequence[] = { - MSEGuidByte2, - MSEFlags, MSEGuidByte3, - MSEFlags2, + MSEGuidByte2, + MSEGuidByte4, + MSEGuidByte5, MSEGuidByte0, MSEGuidByte6, MSEHaveSpline, + MSEFlags2, MSEGuidByte1, - MSEGuidByte4, - MSEGuidByte5, + MSEFlags, MSEGuidByte7, MSEHaveSplineElev, MSEHavePitch, MSEHaveTransportData, - MSETransportGuidByte6, - MSETransportGuidByte3, - MSETransportGuidByte7, - MSETransportGuidByte4, - MSETransportGuidByte1, MSETransportGuidByte0, + MSETransportGuidByte6, MSETransportGuidByte2, MSETransportGuidByte5, - MSETransportHaveTime3, + MSETransportGuidByte4, + MSETransportGuidByte1, + MSETransportGuidByte3, + MSETransportGuidByte7, MSETransportHaveTime2, + MSETransportHaveTime3, MSEHaveFallData, MSEHaveFallDirection, - MSETimestamp, MSEPositionO, + MSETimestamp, MSEPositionX, MSEPositionY, MSEPositionZ, - MSEGuidByte7_2, + MSEGuidByte4_2, MSEGuidByte1_2, + MSEGuidByte2_2, MSESplineElev, - MSEGuidByte3_2, + MSEGuidByte0_2, MSEPitch, - MSETransportTime, + MSEGuidByte6_2, + MSEGuidByte3_2, + MSEGuidByte7_2, + MSEGuidByte5_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, - MSEGuidByte5_2, - MSEGuidByte2_2, - MSEGuidByte6_2, - MSEGuidByte4_2, - MSEGuidByte0_2, - MSEFallVerticalSpeed, + MSETransportGuidByte1_2, + MSETransportGuidByte0_2, + MSETransportGuidByte4_2, MSEFallTime, + MSEFallVerticalSpeed, MSEFallHorizontalSpeed, MSEFallCosAngle, MSEFallSinAngle, }; - +//4.2.2 MovementStatusElements MovementStartTurnLeftSequence[] = { - MSEFlags, - MSEGuidByte3, MSEGuidByte5, - MSEGuidByte7, - MSEFlags2, + MSEGuidByte4, MSEGuidByte6, - MSEHaveSpline, MSEGuidByte0, - MSEGuidByte2, MSEGuidByte1, - MSEGuidByte4, - MSEHaveFallData, - MSEHaveFallDirection, - MSEHaveSplineElev, - MSEHavePitch, + MSEGuidByte7, + MSEGuidByte2, + MSEGuidByte3, + MSEFlags, + MSEFlags2, + MSEHaveSpline, MSEHaveTransportData, - MSETransportGuidByte6, - MSETransportGuidByte3, - MSETransportGuidByte7, - MSETransportGuidByte4, - MSETransportGuidByte1, MSETransportGuidByte0, + MSETransportGuidByte6, MSETransportGuidByte2, MSETransportGuidByte5, - MSETransportHaveTime3, + MSETransportGuidByte4, + MSETransportGuidByte1, + MSETransportGuidByte3, + MSETransportGuidByte7, MSETransportHaveTime2, - MSEPositionO, - MSETimestamp, + MSETransportHaveTime3, + MSEHaveSplineElev, + MSEHaveFallData, + MSEHaveFallDirection, + MSEHavePitch, MSEPositionX, MSEPositionY, MSEPositionZ, - MSEGuidByte2_2, - MSEGuidByte6_2, - MSEFallVerticalSpeed, - MSEFallTime, - MSEFallHorizontalSpeed, - MSEFallCosAngle, - MSEFallSinAngle, - MSEGuidByte4_2, - MSESplineElev, - MSEGuidByte0_2, - MSEGuidByte7_2, - MSEPitch, - MSEGuidByte1_2, - MSEGuidByte5_2, - MSEGuidByte3_2, - MSETransportTime, + MSETimestamp, + MSEPositionO, + 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, + MSEGuidByte4_2, + MSEGuidByte0_2, + MSEGuidByte7_2, + MSEGuidByte1_2, + MSEGuidByte6_2, + MSEGuidByte5_2, + MSEGuidByte3_2, + MSESplineElev, + MSEFallTime, + MSEFallVerticalSpeed, + MSEFallHorizontalSpeed, + MSEFallCosAngle, + MSEFallSinAngle, + MSEGuidByte2_2, + MSEPitch, }; - +//4.2.2 MovementStatusElements MovementStartTurnRightSequence[] = { - MSEGuidByte0, - MSEFlags, - MSEGuidByte7, - MSEHaveSpline, MSEGuidByte4, - MSEGuidByte6, - MSEGuidByte3, MSEGuidByte1, + MSEGuidByte6, + MSEGuidByte0, + MSEFlags, + MSEGuidByte5, MSEFlags2, + MSEHaveSpline, MSEGuidByte2, - MSEGuidByte5, - MSEHaveFallData, - MSEHaveFallDirection, - MSEHavePitch, - MSEHaveSplineElev, + MSEGuidByte3, + MSEGuidByte7, MSEHaveTransportData, - MSETransportGuidByte6, - MSETransportGuidByte3, - MSETransportGuidByte7, - MSETransportGuidByte4, - MSETransportGuidByte1, MSETransportGuidByte0, + MSETransportGuidByte6, MSETransportGuidByte2, MSETransportGuidByte5, - MSETransportHaveTime3, + MSETransportGuidByte4, + MSETransportGuidByte1, + MSETransportGuidByte3, + MSETransportGuidByte7, MSETransportHaveTime2, - MSEPositionO, - MSETimestamp, + MSETransportHaveTime3, + MSEHaveFallData, + MSEHaveFallDirection, + MSEHavePitch, + MSEHaveSplineElev, MSEPositionX, MSEPositionY, MSEPositionZ, - MSEGuidByte1_2, + MSEPositionO, + MSETimestamp, MSEGuidByte6_2, - MSEFallVerticalSpeed, - MSEFallTime, - MSEFallHorizontalSpeed, - MSEFallCosAngle, - MSEFallSinAngle, - MSEGuidByte0_2, - MSEGuidByte5_2, - MSEGuidByte2_2, - MSEPitch, - MSEGuidByte4_2, - MSEGuidByte3_2, - MSEGuidByte7_2, - MSESplineElev, - MSETransportTime, + 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, + MSEGuidByte2_2, + MSEGuidByte4_2, + MSEFallTime, + MSEFallVerticalSpeed, + MSEFallHorizontalSpeed, + MSEFallCosAngle, + MSEFallSinAngle, + MSEPitch, + MSEGuidByte7_2, + MSEGuidByte3_2, + MSEGuidByte1_2, + MSEGuidByte0_2, + MSESplineElev, + MSEGuidByte5_2, }; //4.2.2 MovementStatusElements MovementStopSequence[] = { @@ -902,10 +902,10 @@ MovementStatusElements MovementStopSequence[] = { MSEGuidByte3_2, MSEPitch, MSEFallTime, + MSEFallVerticalSpeed, MSEFallHorizontalSpeed, - MSEFallSinAngle, MSEFallCosAngle, - MSEFallVerticalSpeed, + MSEFallSinAngle, MSEGuidByte5_2, MSEGuidByte7_2, MSETransportSeat, @@ -972,8 +972,8 @@ MovementStatusElements MovementStopStrafeSequence[] = { MSEFallTime, MSEFallVerticalSpeed, MSEFallHorizontalSpeed, - MSEFallSinAngle, MSEFallCosAngle, + MSEFallSinAngle, MSEGuidByte3_2, MSEPitch, MSESplineElev, @@ -995,330 +995,330 @@ MovementStatusElements MovementStopStrafeSequence[] = { MSETransportGuidByte4_2, MSEGuidByte4_2, }; - +//4.2.2 MovementStatusElements MovementStopTurnSequence[] = { - MSEGuidByte3, - MSEGuidByte5, - MSEGuidByte4, + MSEGuidByte6, + MSEFlags, MSEGuidByte2, + MSEGuidByte3, MSEFlags2, - MSEGuidByte0, + MSEGuidByte5, MSEGuidByte7, - MSEGuidByte6, + MSEGuidByte0, + MSEGuidByte4, MSEGuidByte1, MSEHaveSpline, - MSEFlags, + MSEHavePitch, MSEHaveFallData, MSEHaveFallDirection, + MSEHaveSplineElev, MSEHaveTransportData, - MSETransportGuidByte6, - MSETransportGuidByte3, - MSETransportGuidByte7, - MSETransportGuidByte4, - MSETransportGuidByte1, MSETransportGuidByte0, + MSETransportGuidByte6, MSETransportGuidByte2, MSETransportGuidByte5, - MSETransportHaveTime3, + MSETransportGuidByte4, + MSETransportGuidByte1, + MSETransportGuidByte3, + MSETransportGuidByte7, MSETransportHaveTime2, - MSEHaveSplineElev, - MSEHavePitch, - MSEPositionO, + MSETransportHaveTime3, MSETimestamp, MSEPositionX, MSEPositionY, MSEPositionZ, + MSEPositionO, MSEGuidByte4_2, - MSEGuidByte2_2, MSEGuidByte5_2, - MSEFallVerticalSpeed, + MSEGuidByte7_2, + MSEGuidByte1_2, + MSEPitch, + MSEGuidByte3_2, + MSEGuidByte6_2, MSEFallTime, + MSEFallVerticalSpeed, MSEFallHorizontalSpeed, MSEFallCosAngle, MSEFallSinAngle, + MSESplineElev, MSEGuidByte0_2, - MSEGuidByte7_2, - MSEGuidByte6_2, - MSETransportTime, + MSEGuidByte2_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, - MSESplineElev, - MSEGuidByte1_2, - MSEGuidByte3_2, - MSEPitch, + MSETransportGuidByte1_2, + MSETransportGuidByte0_2, + MSETransportGuidByte4_2, }; - +//4.2.2 MovementStatusElements MovementStartAscendSequence[] = { - MSEGuidByte2, MSEGuidByte3, - MSEGuidByte6, - MSEGuidByte4, - MSEGuidByte0, - MSEHaveSpline, MSEGuidByte1, MSEGuidByte5, MSEFlags, - MSEFlags2, + MSEGuidByte4, + MSEGuidByte6, + MSEGuidByte0, MSEGuidByte7, + MSEFlags2, + MSEGuidByte2, + MSEHaveSpline, + MSEHaveFallData, + MSEHaveFallDirection, + MSEHavePitch, + MSEHaveSplineElev, MSEHaveTransportData, - MSETransportGuidByte6, - MSETransportGuidByte3, - MSETransportGuidByte7, - MSETransportGuidByte4, - MSETransportGuidByte1, MSETransportGuidByte0, + MSETransportGuidByte6, MSETransportGuidByte2, MSETransportGuidByte5, - MSETransportHaveTime3, + MSETransportGuidByte4, + MSETransportGuidByte1, + MSETransportGuidByte3, + MSETransportGuidByte7, MSETransportHaveTime2, - MSEHaveFallData, - MSEHaveFallDirection, - MSEHavePitch, - MSEHaveSplineElev, - MSEPositionO, + MSETransportHaveTime3, MSEPositionX, MSEPositionY, MSEPositionZ, MSETimestamp, - MSETransportTime, + MSEPositionO, + MSEGuidByte3_2, + MSEFallTime, + MSEFallVerticalSpeed, + MSEFallHorizontalSpeed, + MSEFallCosAngle, + MSEFallSinAngle, + MSEPitch, + MSEGuidByte0_2, + MSEGuidByte5_2, + MSESplineElev, + MSEGuidByte1_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, - MSEGuidByte5_2, - MSEGuidByte3_2, + MSETransportGuidByte1_2, + MSETransportGuidByte0_2, + MSETransportGuidByte4_2, MSEGuidByte4_2, - MSEFallVerticalSpeed, - MSEFallTime, - MSEFallHorizontalSpeed, - MSEFallCosAngle, - MSEFallSinAngle, - MSEGuidByte0_2, + MSEGuidByte7_2, MSEGuidByte2_2, - MSEPitch, MSEGuidByte6_2, - MSESplineElev, - MSEGuidByte7_2, - MSEGuidByte1_2, }; - +//4.2.2 MovementStatusElements MovementStartDescendSequence[] = { - MSEGuidByte7, - MSEGuidByte0, - MSEGuidByte2, - MSEGuidByte1, MSEGuidByte6, + MSEGuidByte1, + MSEGuidByte0, + MSEGuidByte3, + MSEFlags, MSEGuidByte4, - MSEGuidByte5, + MSEGuidByte7, MSEHaveSpline, - MSEGuidByte3, + MSEGuidByte5, MSEFlags2, - MSEFlags, + MSEGuidByte2, + MSEHaveSplineElev, MSEHaveFallData, MSEHaveFallDirection, - MSEHavePitch, - MSEHaveSplineElev, MSEHaveTransportData, - MSETransportGuidByte6, - MSETransportGuidByte3, - MSETransportGuidByte7, - MSETransportGuidByte4, - MSETransportGuidByte1, MSETransportGuidByte0, + MSETransportGuidByte6, MSETransportGuidByte2, MSETransportGuidByte5, - MSETransportHaveTime3, + MSETransportGuidByte4, + MSETransportGuidByte1, + MSETransportGuidByte3, + MSETransportGuidByte7, MSETransportHaveTime2, + MSETransportHaveTime3, + MSEHavePitch, MSETimestamp, MSEPositionX, MSEPositionY, MSEPositionZ, MSEPositionO, - MSEGuidByte3_2, + MSESplineElev, + MSEGuidByte7_2, MSEGuidByte4_2, MSEGuidByte2_2, - MSEFallVerticalSpeed, + MSEGuidByte5_2, MSEFallTime, + MSEFallVerticalSpeed, MSEFallHorizontalSpeed, MSEFallCosAngle, MSEFallSinAngle, - MSEPitch, - MSEGuidByte5_2, - MSESplineElev, - 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, - MSEGuidByte1_2, + MSETransportGuidByte1_2, + MSETransportGuidByte0_2, + MSETransportGuidByte4_2, MSEGuidByte0_2, - MSEGuidByte7_2, - MSEGuidByte6_2, + MSEGuidByte3_2, + MSEGuidByte1_2, + MSEPitch, }; - +//4.2.2 MovementStatusElements MovementStartSwimSequence[] = { - MSEGuidByte1, - MSEGuidByte5, - MSEFlags, MSEGuidByte2, MSEHaveSpline, + MSEGuidByte1, + MSEFlags, + MSEGuidByte3, + MSEGuidByte5, + MSEGuidByte0, MSEGuidByte6, + MSEGuidByte7, MSEFlags2, MSEGuidByte4, - MSEGuidByte7, - MSEGuidByte0, - MSEGuidByte3, MSEHavePitch, MSEHaveSplineElev, MSEHaveFallData, MSEHaveFallDirection, MSEHaveTransportData, - MSETransportGuidByte6, - MSETransportGuidByte3, - MSETransportGuidByte7, - MSETransportGuidByte4, - MSETransportGuidByte1, MSETransportGuidByte0, + MSETransportGuidByte6, MSETransportGuidByte2, MSETransportGuidByte5, - MSETransportHaveTime3, + MSETransportGuidByte4, + MSETransportGuidByte1, + MSETransportGuidByte3, + MSETransportGuidByte7, MSETransportHaveTime2, - MSEPositionO, + MSETransportHaveTime3, MSEPositionX, MSEPositionY, MSEPositionZ, + MSEPositionO, MSETimestamp, MSEPitch, - MSEGuidByte4_2, MSESplineElev, - MSEFallVerticalSpeed, + MSEGuidByte2_2, + MSEGuidByte0_2, + MSEGuidByte5_2, + MSEGuidByte4_2, + MSEGuidByte7_2, + MSEGuidByte1_2, MSEFallTime, + MSEFallVerticalSpeed, MSEFallHorizontalSpeed, MSEFallCosAngle, MSEFallSinAngle, - MSEGuidByte0_2, - MSEGuidByte7_2, - MSETransportTime, + 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, + MSETransportGuidByte1_2, + MSETransportGuidByte0_2, + MSETransportGuidByte4_2, MSEGuidByte6_2, - MSEGuidByte5_2, - MSEGuidByte2_2, - MSEGuidByte1_2, - MSEGuidByte3_2, }; - +//4.2.2 MovementStatusElements MovementStopAscendSequence[] = { + MSEFlags2, MSEHaveSpline, - MSEGuidByte5, + MSEGuidByte4, MSEGuidByte3, + MSEGuidByte0, MSEGuidByte1, + MSEGuidByte5, MSEFlags, - MSEGuidByte4, MSEGuidByte7, MSEGuidByte2, - MSEFlags2, MSEGuidByte6, - MSEGuidByte0, - MSEHavePitch, - MSEHaveSplineElev, - MSEHaveFallData, - MSEHaveFallDirection, MSEHaveTransportData, - MSETransportGuidByte6, - MSETransportGuidByte3, - MSETransportGuidByte7, - MSETransportGuidByte4, - MSETransportGuidByte1, MSETransportGuidByte0, + MSETransportGuidByte6, MSETransportGuidByte2, MSETransportGuidByte5, - MSETransportHaveTime3, + MSETransportGuidByte4, + MSETransportGuidByte1, + MSETransportGuidByte3, + MSETransportGuidByte7, MSETransportHaveTime2, + MSETransportHaveTime3, + MSEHaveFallData, + MSEHaveFallDirection, + MSEHaveSplineElev, + MSEHavePitch, MSETimestamp, MSEPositionX, MSEPositionY, MSEPositionZ, MSEPositionO, - MSEGuidByte5_2, - MSEGuidByte2_2, - MSEGuidByte0_2, + MSEGuidByte4_2, MSEGuidByte7_2, - MSEPitch, MSEGuidByte3_2, - MSEGuidByte4_2, - MSEGuidByte1_2, - MSESplineElev, - MSEFallVerticalSpeed, - MSEFallTime, - MSEFallHorizontalSpeed, - MSEFallCosAngle, - MSEFallSinAngle, - MSEGuidByte6_2, - MSETransportTime, + MSEGuidByte2_2, + MSEGuidByte5_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, + MSEFallTime, + MSEFallVerticalSpeed, + MSEFallHorizontalSpeed, + MSEFallCosAngle, + MSEFallSinAngle, + MSEGuidByte1_2, + MSESplineElev, + MSEGuidByte0_2, + MSEGuidByte6_2, + MSEPitch, }; MovementStatusElements* GetMovementStatusElementsSequence(Opcodes opcode) @@ -1343,25 +1343,25 @@ MovementStatusElements* GetMovementStatusElementsSequence(Opcodes opcode) return MovementStartForwardSequence; case MSG_MOVE_START_STRAFE_LEFT://done return MovementStartStrafeLeftSequence; - case MSG_MOVE_START_STRAFE_RIGHT: + case MSG_MOVE_START_STRAFE_RIGHT://done return MovementStartStrafeRightSequence; - case MSG_MOVE_START_TURN_LEFT: + case MSG_MOVE_START_TURN_LEFT://done return MovementStartTurnLeftSequence; - case MSG_MOVE_START_TURN_RIGHT: + case MSG_MOVE_START_TURN_RIGHT://done return MovementStartTurnRightSequence; case MSG_MOVE_STOP://done return MovementStopSequence; case MSG_MOVE_STOP_STRAFE://done return MovementStopStrafeSequence; - case MSG_MOVE_STOP_TURN: + case MSG_MOVE_STOP_TURN://done return MovementStopTurnSequence; - case MSG_MOVE_START_ASCEND: + case MSG_MOVE_START_ASCEND://done return MovementStartAscendSequence; - case MSG_MOVE_START_DESCEND: + case MSG_MOVE_START_DESCEND://done return MovementStartDescendSequence; - case MSG_MOVE_START_SWIM: + case MSG_MOVE_START_SWIM://done return MovementStartSwimSequence; - case MSG_MOVE_STOP_ASCEND: + case MSG_MOVE_STOP_ASCEND://done return MovementStopAscendSequence; default: break; diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index db6c75304a4..bc9cf569b3d 100755 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -161,9 +161,9 @@ void WorldSession::SendPacket(WorldPacket const* packet) if (packet->GetOpcode() == NULL_OPCODE || packet->GetOpcode() == UNKNOWN_OPCODE) { - sLog->outError("Prevented sending of %s. Trace:", packet->GetOpcode() == NULL_OPCODE ? "NULL_OPCODE" : "UNKNOWN_OPCODE"); - ACE_Stack_Trace trace; - sLog->outError("%s", trace.c_str()); + sLog->outError("Prevented sending of %s", packet->GetOpcode() == NULL_OPCODE ? "NULL_OPCODE" : "UNKNOWN_OPCODE"); + //ACE_Stack_Trace trace; + //sLog->outError("%s", trace.c_str()); return; } diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 16f06563630..2d5dbc0d3aa 100755 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -170,7 +170,7 @@ class ByteBuffer uint32 value = 0; for (int32 i = bits-1; i >= 0; --i) if (ReadBit()) - value |= (1 << (_bitpos)); + value |= (1 << (i)); return value; } |