diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2018-04-23 23:35:31 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-09-26 14:21:14 +0200 |
| commit | 0b6049fe0bf49a8c21114960cb7a6522f48c8308 (patch) | |
| tree | 6dc6a9ed2efddc695d0d6bef2533a2174e5e9a15 /src/server/game/Movement | |
| parent | d59a6af9c694713fd868db4bae09df3f8b9e041e (diff) | |
Core/Movement: use helpers for validation
(cherry picked from commit 71188062314ee94402d9d3e228fd5b46e8865b18)
Diffstat (limited to 'src/server/game/Movement')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Movement/MovementDefines.h | 3 |
2 files changed, 5 insertions, 4 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]; diff --git a/src/server/game/Movement/MovementDefines.h b/src/server/game/Movement/MovementDefines.h index e414c6f92bd..a19dedcba5e 100644 --- a/src/server/game/Movement/MovementDefines.h +++ b/src/server/game/Movement/MovementDefines.h @@ -99,6 +99,7 @@ struct JumpArrivalCastArgs ObjectGuid Target; }; -inline bool IsInvalidMovementGeneratorType(MovementGeneratorType const type) { return type == MAX_DB_MOTION_TYPE || type == MAX_MOTION_TYPE; } +inline bool IsInvalidMovementGeneratorType(uint8 const type) { return type == MAX_DB_MOTION_TYPE || type >= MAX_MOTION_TYPE; } +inline bool IsInvalidMovementSlot(uint8 const slot) { return slot >= MAX_MOTION_SLOT; } #endif |