diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2017-03-25 12:02:25 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2020-04-24 17:18:49 +0200 |
| commit | dbe54973fbbcfca55316e03b8a27dcd6d115b543 (patch) | |
| tree | 1613cf737ff28665bc92d96b1362ac9e715743ae /src | |
| parent | 6f523b4fb65331acca28b5ac00f14551427d038d (diff) | |
Core/Movement: cleanup MovementGeneratorType
(cherry picked from commit fce974c3b33b38b71166960d37ca8cff67fa8f14)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Movement/MotionMaster.h | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 02e6aad28af..9e50147cb56 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -159,7 +159,7 @@ MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const MovementGeneratorType MotionMaster::GetMotionSlotType(int slot) const { if (!_slot[slot]) - return NULL_MOTION_TYPE; + return MAX_MOTION_TYPE; else return _slot[slot]->GetMovementGeneratorType(); } diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index f8dbe43306d..af1ed481889 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -52,7 +52,6 @@ enum MovementGeneratorType : uint8 RANDOM_MOTION_TYPE = 1, // RandomMovementGenerator.h WAYPOINT_MOTION_TYPE = 2, // WaypointMovementGenerator.h MAX_DB_MOTION_TYPE = 3, // Below motion types can't be set in DB. - ANIMAL_RANDOM_MOTION_TYPE = MAX_DB_MOTION_TYPE, // AnimalRandomMovementGenerator.h CONFUSED_MOTION_TYPE = 4, // ConfusedMovementGenerator.h CHASE_MOTION_TYPE = 5, // TargetedMovementGenerator.h HOME_MOTION_TYPE = 6, // HomeMovementGenerator.h @@ -60,14 +59,13 @@ enum MovementGeneratorType : uint8 POINT_MOTION_TYPE = 8, // PointMovementGenerator.h FLEEING_MOTION_TYPE = 9, // FleeingMovementGenerator.h DISTRACT_MOTION_TYPE = 10, // IdleMovementGenerator.h - ASSISTANCE_MOTION_TYPE = 11, // PointMovementGenerator.h (first part of flee for assistance) - ASSISTANCE_DISTRACT_MOTION_TYPE = 12, // IdleMovementGenerator.h (second part of flee for assistance) - TIMED_FLEEING_MOTION_TYPE = 13, // FleeingMovementGenerator.h (alt.second part of flee for assistance) + ASSISTANCE_MOTION_TYPE = 11, // PointMovementGenerator.h + ASSISTANCE_DISTRACT_MOTION_TYPE = 12, // IdleMovementGenerator.h + TIMED_FLEEING_MOTION_TYPE = 13, // FleeingMovementGenerator.h FOLLOW_MOTION_TYPE = 14, ROTATE_MOTION_TYPE = 15, EFFECT_MOTION_TYPE = 16, - NULL_MOTION_TYPE = 17, - SPLINE_CHAIN_MOTION_TYPE = 18, // SplineChainMovementGenerator.h + SPLINE_CHAIN_MOTION_TYPE = 17, // SplineChainMovementGenerator.h MAX_MOTION_TYPE // limit }; |