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 | |
| parent | e55516348dbabaa8c9d559426315f3f70967acaa (diff) | |
Core/Common: Merge TimeTrackerSmall with TimeTracker
Diffstat (limited to 'src/server/game')
9 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index a1d191b48e3..1c3978a8367 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2425,7 +2425,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> bool m_needsZoneUpdate; - TimeTrackerSmall m_groupUpdateTimer; + TimeTracker m_groupUpdateTimer; private: // internal common parts for CanStore/StoreItem functions diff --git a/src/server/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h index 55eacf0c601..6f2b30f7408 100644 --- a/src/server/game/Entities/Transport/Transport.h +++ b/src/server/game/Entities/Transport/Transport.h @@ -117,7 +117,7 @@ class TC_GAME_API Transport : public GameObject, public TransportBase KeyFrameVec::const_iterator _currentFrame; KeyFrameVec::const_iterator _nextFrame; - TimeTrackerSmall _positionChangeTimer; + TimeTracker _positionChangeTimer; bool _isMoving; bool _pendingStop; diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 43999fadf10..3ea466d9f0f 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1800,7 +1800,7 @@ class TC_GAME_API Unit : public WorldObject uint32 m_state; // Even derived shouldn't modify uint32 m_lastManaUse; // msecs - TimeTrackerSmall m_splineSyncTimer; + TimeTracker m_splineSyncTimer; DiminishingReturn m_Diminishing[DIMINISHING_MAX]; diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index ff12ddb7e79..d316bfeaddc 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -370,6 +370,6 @@ class TC_GAME_API Group uint32 m_maxEnchantingLevel; uint32 m_dbStoreId; // Represents the ID used in database (Can be reused by other groups if group was disbanded) bool m_isLeaderOffline; - TimeTrackerSmall m_leaderOfflineTimer; + TimeTracker m_leaderOfflineTimer; }; #endif 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; |
