Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Common: Merge TimeTrackerSmall with TimeTracker

Browse Source 
(cherry picked from commit 228696bf80)
This commit is contained in:
Carbenium
2020-07-29 00:16:15 +02:00
committed by Shauren
parent 35e0002df3
commit 8809d54ca2
15 changed files with 30 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
View File

@@ -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;

2
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
View File

@@ -153,7 +153,7 @@ struct boss_high_inquisitor_fairbanks : public BossAI
}
private:
TimeTrackerSmall _healTimer;
TimeTracker _healTimer;
bool _powerWordShield;
};

4
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
View File

@@ -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;
};