From 228696bf80bcd55d35445cd24ae119020c310f88 Mon Sep 17 00:00:00 2001 From: Carbenium Date: Wed, 29 Jul 2020 00:16:15 +0200 Subject: Core/Common: Merge TimeTrackerSmall with TimeTracker --- .../EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp | 6 +++--- .../ScarletMonastery/boss_high_inquisitor_fairbanks.cpp | 2 +- .../ScarletMonastery/boss_mograine_and_whitemane.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/scripts') 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; }; -- cgit v1.2.3