diff options
| author | Carbenium <carbenium@outlook.com> | 2020-07-29 00:16:15 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-24 21:34:36 +0100 |
| commit | 8809d54ca2daa230b1439f012c8b10ee88d6beae (patch) | |
| tree | c5d209bcf4d7c5b231f113cc1d08dd6b3c05184a /src/server/game/Entities | |
| parent | 35e0002df3073cf4c3e1dae9fbff73d75ddb5e98 (diff) | |
Core/Common: Merge TimeTrackerSmall with TimeTracker
(cherry picked from commit 228696bf80bcd55d35445cd24ae119020c310f88)
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Transport/Transport.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 26e013d2b63..b30a748cde9 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -3026,7 +3026,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> std::array<std::unique_ptr<CUFProfile>, MAX_CUF_PROFILES> _CUFProfiles; - 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 a8c8a6ae8ff..5ab4adee156 100644 --- a/src/server/game/Entities/Transport/Transport.h +++ b/src/server/game/Entities/Transport/Transport.h @@ -118,7 +118,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 5098645b431..520b6fb1a30 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1981,7 +1981,7 @@ class TC_GAME_API Unit : public WorldObject private: uint32 m_state; // Even derived shouldn't modify - TimeTrackerSmall m_splineSyncTimer; + TimeTracker m_splineSyncTimer; Diminishing m_Diminishing; |
