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/scripts | |
| parent | 35e0002df3073cf4c3e1dae9fbff73d75ddb5e98 (diff) | |
Core/Common: Merge TimeTrackerSmall with TimeTracker
(cherry picked from commit 228696bf80bcd55d35445cd24ae119020c310f88)
Diffstat (limited to 'src/server/scripts')
3 files changed, 6 insertions, 6 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 28a8dfe30bb..1e610d06073 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -236,7 +236,7 @@ struct npc_wisp_invis : public ScriptedAI } private: - TimeTrackerSmall _timer; + TimeTracker _timer; uint32 _creatureType; uint32 _firstSpell; uint32 _secondSpell; @@ -428,7 +428,7 @@ private: } TaskScheduler _scheduler; - TimeTrackerSmall _laughTimer; + TimeTracker _laughTimer; ObjectGuid _bodyGUID; uint32 _phase; bool _withBody; @@ -807,7 +807,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 54a52074021..4937a8d65fa 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -232,7 +232,7 @@ public: } private: - TimeTrackerSmall _killYellTimer; + TimeTracker _killYellTimer; bool _fakeDeath; bool _canDie; }; @@ -427,7 +427,7 @@ private: InstanceScript* _instance; EventMap _events; TaskScheduler _scheduler; - TimeTrackerSmall _killYellTimer; + TimeTracker _killYellTimer; bool _ressurectionInProgress; bool _canDie; }; |
