aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorCarbenium <carbenium@outlook.com>2020-07-29 00:16:15 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-24 21:34:36 +0100
commit8809d54ca2daa230b1439f012c8b10ee88d6beae (patch)
treec5d209bcf4d7c5b231f113cc1d08dd6b3c05184a /src/server/game
parent35e0002df3073cf4c3e1dae9fbff73d75ddb5e98 (diff)
Core/Common: Merge TimeTrackerSmall with TimeTracker
(cherry picked from commit 228696bf80bcd55d35445cd24ae119020c310f88)
Diffstat (limited to 'src/server/game')
-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
-rw-r--r--src/server/game/Groups/Group.h2
-rw-r--r--src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.h2
-rw-r--r--src/server/game/Movement/MovementGenerators/FollowMovementGenerator.h2
-rw-r--r--src/server/game/Movement/MovementGenerators/FormationMovementGenerator.h2
-rw-r--r--src/server/game/Movement/MovementGenerators/GenericMovementGenerator.h2
-rwxr-xr-xsrc/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h2
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 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;
diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h
index d833bbdc639..30ea6c7b567 100644
--- a/src/server/game/Groups/Group.h
+++ b/src/server/game/Groups/Group.h
@@ -458,7 +458,7 @@ 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;
// Ready Check
bool m_readyCheckStarted;
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 bd9bfcf9680..6655cd693a7 100644
--- a/src/server/game/Movement/MovementGenerators/GenericMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/GenericMovementGenerator.h
@@ -45,7 +45,7 @@ class GenericMovementGenerator : public MovementGenerator
Movement::MoveSplineInit _splineInit;
MovementGeneratorType _type;
uint32 _pointId;
- TimeTrackerSmall _duration;
+ TimeTracker _duration;
uint32 _arrivalSpellId;
ObjectGuid _arrivalSpellTargetGuid;
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;