diff options
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index c66f6f5a935..d2ebbf22faa 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -137,7 +137,7 @@ void MotionMaster::Clear(bool reset /*= true*/) void MotionMaster::Clear(MovementSlot slot) { - if (empty() || slot >= MAX_MOTION_SLOT) + if (empty() || IsInvalidMovementSlot(slot)) return; if (_cleanFlag & MOTIONMMASTER_CLEANFLAG_UPDATE) @@ -174,7 +174,7 @@ MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const MovementGeneratorType MotionMaster::GetMotionSlotType(MovementSlot slot) const { - if (empty() || slot >= MAX_MOTION_SLOT || !_slot[slot]) + if (empty() || IsInvalidMovementSlot(slot) || !_slot[slot]) return MAX_MOTION_TYPE; return _slot[slot]->GetMovementGeneratorType(); @@ -182,7 +182,7 @@ MovementGeneratorType MotionMaster::GetMotionSlotType(MovementSlot slot) const MovementGenerator* MotionMaster::GetMotionSlot(MovementSlot slot) const { - if (empty() || slot >= MAX_MOTION_SLOT || !_slot[slot]) + if (empty() || IsInvalidMovementSlot(slot) || !_slot[slot]) return nullptr; return _slot[slot]; |