diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2018-04-23 23:35:31 +0200 |
|---|---|---|
| committer | ccrs <ccrs@users.noreply.github.com> | 2018-04-23 23:35:31 +0200 |
| commit | 71188062314ee94402d9d3e228fd5b46e8865b18 (patch) | |
| tree | f6d481e4fdb43a980554d9304bf83b24b4c6a231 /src/server/game/Movement/MotionMaster.cpp | |
| parent | 2a45418032233bc8779cdb44f9be6057c4b417c5 (diff) | |
Core/Movement: use helpers for validation
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 281393f379e..37969f51483 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]; |