diff options
| author | Carbenium <carbenium@outlook.com> | 2020-07-29 00:16:15 +0200 |
|---|---|---|
| committer | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-08-01 12:43:55 +0200 |
| commit | 228696bf80bcd55d35445cd24ae119020c310f88 (patch) | |
| tree | 073acb30aafa0a2e83e570c60d5582e9ac605885 /src/server/game/Movement | |
| parent | e55516348dbabaa8c9d559426315f3f70967acaa (diff) | |
Core/Common: Merge TimeTrackerSmall with TimeTracker
Diffstat (limited to 'src/server/game/Movement')
5 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.h index 5c08a01965d..6010f164d13 100644 --- a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.h @@ -51,7 +51,7 @@ class ChaseMovementGenerator : public MovementGenerator, public AbstractFollower std::unique_ptr<PathGenerator> _path; Optional<Position> _lastTargetPosition; - TimeTrackerSmall _rangeCheckTimer; + TimeTracker _rangeCheckTimer; bool _movingTowards = true; bool _mutualChase = true; }; diff --git a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h index e3661cef014..455a3535921 100644 --- a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h @@ -53,7 +53,7 @@ class FollowMovementGenerator : public MovementGenerator, public AbstractFollowe float const _range; ChaseAngle const _angle; - TimeTrackerSmall _checkTimer; + TimeTracker _checkTimer; std::unique_ptr<PathGenerator> _path; Optional<Position> _lastTargetPosition; }; diff --git a/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.h index 4c3adaf192b..481e050ff07 100644 --- a/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.h @@ -51,7 +51,7 @@ class FormationMovementGenerator : public MovementGeneratorMedium<Creature, Form bool _hasPredictedDestination; Position _lastLeaderPosition; - TimeTrackerSmall _nextMoveTimer; + TimeTracker _nextMoveTimer; }; #endif // TRINITY_FORMATIONMOVEMENTGENERATOR_H diff --git a/src/server/game/Movement/MovementGenerators/GenericMovementGenerator.h b/src/server/game/Movement/MovementGenerators/GenericMovementGenerator.h index 0ea42569bcc..0217f6fb1db 100644 --- a/src/server/game/Movement/MovementGenerators/GenericMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/GenericMovementGenerator.h @@ -44,7 +44,7 @@ class GenericMovementGenerator : public MovementGenerator Movement::MoveSplineInit _splineInit; MovementGeneratorType _type; uint32 _pointId; - TimeTrackerSmall _duration; + TimeTracker _duration; }; #endif diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index 9efeded9fee..e265c62522b 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -68,7 +68,7 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium<Creat return false; } - TimeTrackerSmall _nextMoveTime; + TimeTracker _nextMoveTime; uint32 _pathId; bool _repeating; bool _loadedFromDB; |