aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities
diff options
context:
space:
mode:
authorCarbenium <carbenium@outlook.com>2020-07-29 00:16:15 +0200
committerPeter Keresztes Schmidt <carbenium@outlook.com>2020-08-01 12:43:55 +0200
commit228696bf80bcd55d35445cd24ae119020c310f88 (patch)
tree073acb30aafa0a2e83e570c60d5582e9ac605885 /src/server/game/Entities
parente55516348dbabaa8c9d559426315f3f70967acaa (diff)
Core/Common: Merge TimeTrackerSmall with TimeTracker
Diffstat (limited to 'src/server/game/Entities')
-rw-r--r--src/server/game/Entities/Player/Player.h2
-rw-r--r--src/server/game/Entities/Transport/Transport.h2
-rw-r--r--src/server/game/Entities/Unit/Unit.h2
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 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];