diff options
| -rw-r--r-- | src/server/game/Entities/Unit/UnitDefines.h | 31 | ||||
| -rw-r--r-- | src/server/game/Movement/Spline/MovementUtil.cpp | 29 |
2 files changed, 26 insertions, 34 deletions
diff --git a/src/server/game/Entities/Unit/UnitDefines.h b/src/server/game/Entities/Unit/UnitDefines.h index bf5b398db6a..103d8ae9d2e 100644 --- a/src/server/game/Entities/Unit/UnitDefines.h +++ b/src/server/game/Entities/Unit/UnitDefines.h @@ -349,24 +349,19 @@ enum MovementFlags2 : uint32 MOVEMENTFLAG2_FULL_SPEED_PITCHING = 0x00000008, MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING = 0x00000010, MOVEMENTFLAG2_IS_VEHICLE_EXIT_VOLUNTARY = 0x00000020, - MOVEMENTFLAG2_JUMP_SPLINE_IN_AIR = 0x00000040, - MOVEMENTFLAG2_ANIM_TIER_IN_TRANS = 0x00000080, - MOVEMENTFLAG2_WATERWALKING_FULL_PITCH = 0x00000100, // will always waterwalk, even if facing the camera directly down - MOVEMENTFLAG2_VEHICLE_PASSENGER_IS_TRANSITION_ALLOWED = 0x00000200, - MOVEMENTFLAG2_CAN_SWIM_TO_FLY_TRANS = 0x00000400, - MOVEMENTFLAG2_UNK11 = 0x00000800, // terrain normal calculation is disabled if this flag is not present, client automatically handles setting this flag - MOVEMENTFLAG2_CAN_TURN_WHILE_FALLING = 0x00001000, - MOVEMENTFLAG2_UNK13 = 0x00002000, // set automatically by the client for aura 373 - MOVEMENTFLAG2_IGNORE_MOVEMENT_FORCES = 0x00004000, - MOVEMENTFLAG2_UNK15 = 0x00008000, - MOVEMENTFLAG2_CAN_DOUBLE_JUMP = 0x00010000, - MOVEMENTFLAG2_DOUBLE_JUMP = 0x00020000, - // these flags cannot be sent (18 bits in packet) - MOVEMENTFLAG2_UNK18 = 0x00040000, - MOVEMENTFLAG2_AWAITING_LOAD = 0x00080000, - MOVEMENTFLAG2_INTERPOLATED_MOVEMENT = 0x00100000, - MOVEMENTFLAG2_INTERPOLATED_TURNING = 0x00200000, - MOVEMENTFLAG2_INTERPOLATED_PITCHING = 0x00400000 + MOVEMENTFLAG2_WATERWALKING_FULL_PITCH = 0x00000040, // will always waterwalk, even if facing the camera directly down + MOVEMENTFLAG2_VEHICLE_PASSENGER_IS_TRANSITION_ALLOWED = 0x00000080, + MOVEMENTFLAG2_CAN_SWIM_TO_FLY_TRANS = 0x00000100, + MOVEMENTFLAG2_UNK9 = 0x00000200, // terrain normal calculation is disabled if this flag is not present, client automatically handles setting this flag + MOVEMENTFLAG2_CAN_TURN_WHILE_FALLING = 0x00000400, + MOVEMENTFLAG2_IGNORE_MOVEMENT_FORCES = 0x00000800, + MOVEMENTFLAG2_CAN_DOUBLE_JUMP = 0x00001000, + MOVEMENTFLAG2_DOUBLE_JUMP = 0x00002000, + // these flags are not sent + MOVEMENTFLAG2_AWAITING_LOAD = 0x00010000, + MOVEMENTFLAG2_INTERPOLATED_MOVEMENT = 0x00020000, + MOVEMENTFLAG2_INTERPOLATED_TURNING = 0x00040000, + MOVEMENTFLAG2_INTERPOLATED_PITCHING = 0x00080000 }; enum HitInfo diff --git a/src/server/game/Movement/Spline/MovementUtil.cpp b/src/server/game/Movement/Spline/MovementUtil.cpp index f8e9ba0d8a6..155e48ba8f6 100644 --- a/src/server/game/Movement/Spline/MovementUtil.cpp +++ b/src/server/game/Movement/Spline/MovementUtil.cpp @@ -126,23 +126,20 @@ namespace Movement STRINGIZE(FullSpeedPitching ), // 0x00000008 STRINGIZE(Allow_Pitching ), // 0x00000010 STRINGIZE(VehicleExitVoluntary ), // 0x00000020 - STRINGIZE(JumpSplineInAir ), // 0x00000040 - STRINGIZE(AnimTierInTrans ), // 0x00000080 - STRINGIZE(WaterwalkingFullPitch ), // 0x00000100 - STRINGIZE(VehiclePassengerIsTransitionAllowed), // 0x00000200 - STRINGIZE(CanSwimToFlyTrans ), // 0x00000400 - STRINGIZE(Unk11 ), // 0x00000800 - STRINGIZE(CanTurnWhileFalling ), // 0x00001000 - STRINGIZE(Unk13 ), // 0x00002000 - STRINGIZE(IgnoreMovementForces ), // 0x00004000 + STRINGIZE(WaterwalkingFullPitch ), // 0x00000040 + STRINGIZE(VehiclePassengerIsTransitionAllowed), // 0x00000080 + STRINGIZE(CanSwimToFlyTrans ), // 0x00000100 + STRINGIZE(Unk9 ), // 0x00000200 + STRINGIZE(CanTurnWhileFalling ), // 0x00000400 + STRINGIZE(IgnoreMovementForces ), // 0x00000800 + STRINGIZE(CanDoubleJump ), // 0x00001000 + STRINGIZE(DoubleJump ), // 0x00002000 + STRINGIZE(Unk14 ), // 0x00004000 STRINGIZE(Unk15 ), // 0x00008000 - STRINGIZE(CanDoubleJump ), // 0x00010000 - STRINGIZE(DoubleJump ), // 0x00020000 - STRINGIZE(Unk18 ), // 0x00040000 - STRINGIZE(AwaitingLoad ), // 0x00080000 - STRINGIZE(InterpolatedMovement ), // 0x00100000 - STRINGIZE(InterpolatedTurning ), // 0x00200000 - STRINGIZE(InterpolatedPitching ), // 0x00400000 + STRINGIZE(AwaitingLoad ), // 0x00010000 + STRINGIZE(InterpolatedMovement ), // 0x00020000 + STRINGIZE(InterpolatedTurning ), // 0x00040000 + STRINGIZE(InterpolatedPitching ), // 0x00080000 }; char const* SplineFlagNames[32] = |