diff options
15 files changed, 30 insertions, 70 deletions
diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp index 35047464231..b6f26e3443d 100644 --- a/src/common/Collision/DynamicTree.cpp +++ b/src/common/Collision/DynamicTree.cpp @@ -103,7 +103,7 @@ struct DynTreeImpl : public ParentTree/*, public Intersectable*/ } } - TimeTrackerSmall rebalance_timer; + TimeTracker rebalance_timer; int unbalanced_times; }; diff --git a/src/common/Utilities/Timer.h b/src/common/Utilities/Timer.h index 8acd5cbdc11..89fa2a0ef1a 100644 --- a/src/common/Utilities/Timer.h +++ b/src/common/Utilities/Timer.h @@ -115,81 +115,41 @@ private: struct TimeTracker { public: - - TimeTracker(time_t expiry) - : i_expiryTime(expiry) - { - } - - void Update(time_t diff) - { - i_expiryTime -= diff; - } - - bool Passed() const - { - return i_expiryTime <= 0; - } - - void Reset(time_t interval) - { - i_expiryTime = interval; - } - - time_t GetExpiry() const - { - return i_expiryTime; - } - -private: - - time_t i_expiryTime; -}; - -struct TimeTrackerSmall -{ -public: - - TimeTrackerSmall(int32 expiry = 0) - : i_expiryTime(expiry) - { - } - - TimeTrackerSmall(Milliseconds expiry) : i_expiryTime(expiry.count()) { } + TimeTracker(int32 expiry = 0) : _expiryTime(expiry) { } + TimeTracker(Milliseconds expiry) : _expiryTime(expiry) { } void Update(int32 diff) { - i_expiryTime -= diff; + Update(Milliseconds(diff)); } void Update(Milliseconds diff) { - Update(diff.count()); + _expiryTime -= diff; } bool Passed() const { - return i_expiryTime <= 0; + return _expiryTime <= 0s; } - void Reset(int32 interval) + void Reset(int32 expiry) { - i_expiryTime = interval; + Reset(Milliseconds(expiry)); } void Reset(Milliseconds expiry) { - Reset(expiry.count()); + _expiryTime = expiry; } Milliseconds GetExpiry() const { - return Milliseconds(i_expiryTime); + return _expiryTime; } private: - - int32 i_expiryTime; + Milliseconds _expiryTime; }; struct PeriodicTimer 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; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 1db5952bd57..0362c6423d4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -237,7 +237,7 @@ struct npc_wisp_invis : public ScriptedAI } private: - TimeTrackerSmall _timer; + TimeTracker _timer; uint32 _creatureType; uint32 _firstSpell; uint32 _secondSpell; @@ -429,7 +429,7 @@ private: } TaskScheduler _scheduler; - TimeTrackerSmall _laughTimer; + TimeTracker _laughTimer; ObjectGuid _bodyGUID; uint32 _phase; bool _withBody; @@ -808,7 +808,7 @@ private: InstanceScript* _instance; TaskScheduler _scheduler; - TimeTrackerSmall _laughTimer; + TimeTracker _laughTimer; ObjectGuid _headGUID; uint32 _phase; uint32 _id; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 2f74d20bc49..d72ce5f5381 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -153,7 +153,7 @@ struct boss_high_inquisitor_fairbanks : public BossAI } private: - TimeTrackerSmall _healTimer; + TimeTracker _healTimer; bool _powerWordShield; }; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index ab07d735037..7841f251372 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -233,7 +233,7 @@ public: } private: - TimeTrackerSmall _killYellTimer; + TimeTracker _killYellTimer; bool _fakeDeath; bool _canDie; }; @@ -428,7 +428,7 @@ private: InstanceScript* _instance; EventMap _events; TaskScheduler _scheduler; - TimeTrackerSmall _killYellTimer; + TimeTracker _killYellTimer; bool _ressurectionInProgress; bool _canDie; }; diff --git a/tests/common/test-Timer.cpp b/tests/common/test-Timer.cpp index b71251b2ea9..76d02d51aa0 100644 --- a/tests/common/test-Timer.cpp +++ b/tests/common/test-Timer.cpp @@ -20,9 +20,9 @@ #include "Timer.h" -TEST_CASE("TimerTrackerSmall: Check if time passed") +TEST_CASE("TimeTracker: Check if time passed") { - TimeTrackerSmall tracker(1000 /*ms*/); + TimeTracker tracker(1000 /*ms*/); REQUIRE_FALSE(tracker.Passed()); REQUIRE(tracker.GetExpiry() == 1s); @@ -39,9 +39,9 @@ TEST_CASE("TimerTrackerSmall: Check if time passed") REQUIRE(tracker.GetExpiry() == -500ms); } -TEST_CASE("TimerTrackerSmall: Reset timer") +TEST_CASE("TimeTracker: Reset timer") { - TimeTrackerSmall tracker(1000 /*ms*/); + TimeTracker tracker(1000 /*ms*/); REQUIRE_FALSE(tracker.Passed()); REQUIRE(tracker.GetExpiry() == 1s); |