aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland/TempestKeep
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2014-09-25 22:28:20 +0200
committerjackpoz <giacomopoz@gmail.com>2014-09-25 22:28:20 +0200
commit79b9ca4a58175bcbfe859446dbb36ba4b30216b9 (patch)
treed423f9e3af5bf47966f14d250347d969d337f555 /src/server/scripts/Outland/TempestKeep
parent16a884d999d17290955f3c2721b78a13c8795293 (diff)
Scripts/Misc: Make InstanceScript::Initialize() obsolete
Move all InstanceScript initialization code from Initialize() to the constructor. InstanceScript::Initialize() is now obsolete, please don't use it anymore. The only reason it's still in the sources is for backward compatibility.
Diffstat (limited to 'src/server/scripts/Outland/TempestKeep')
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index 2234547c76a..ebe9ac9865a 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -46,7 +46,14 @@ class instance_the_eye : public InstanceMapScript
struct instance_the_eye_InstanceMapScript : public InstanceScript
{
- instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map) { }
+ instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map)
+ {
+ SetHeaders(DataHeader);
+ memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+
+ KaelthasEventPhase = 0;
+ AlarEventPhase = 0;
+ }
ObjectGuid ThaladredTheDarkener;
ObjectGuid LordSanguinar;
@@ -60,15 +67,6 @@ class instance_the_eye : public InstanceMapScript
uint32 m_auiEncounter[MAX_ENCOUNTER];
- void Initialize() override
- {
- SetHeaders(DataHeader);
- memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
-
- KaelthasEventPhase = 0;
- AlarEventPhase = 0;
- }
-
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)