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.

5 files changed, 14 insertions, 31 deletions

diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
index 3fb090ab94c..ed353b359c9 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -88,10 +88,6 @@ class instance_serpent_shrine : public InstanceMapScript
             instance_serpentshrine_cavern_InstanceMapScript(Map* map) : InstanceScript(map)
             {
                 SetHeaders(DataHeader);
-            }
-
-            void Initialize() override
-            {
                 memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
 
                 StrangePool = 0;
@@ -106,7 +102,6 @@ class instance_serpent_shrine : public InstanceMapScript
                 FrenzySpawnTimer = 2000;
                 DoSpawnFrenzy = false;
                 TrashCount = 0;
-
             }
 
             bool IsEncounterInProgress() const override
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 7b8eeb8834d..d2ef0857b23 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -37,10 +37,6 @@ class instance_ramparts : public InstanceMapScript
             instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map)
             {
                 spawned = false;
-            }
-
-            void Initialize() override
-            {
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
             }
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index db0159d1a2d..a8d840b778a 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -54,6 +54,11 @@ class instance_magtheridons_lair : public InstanceMapScript
         {
             instance_magtheridons_lair_InstanceMapScript(Map* map) : InstanceScript(map)
             {
+                SetHeaders(DataHeader);
+                memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+
+                CageTimer = 0;
+                RespawnTimer = 0;
             }
 
             uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -66,15 +71,6 @@ class instance_magtheridons_lair : public InstanceMapScript
             uint32 CageTimer;
             uint32 RespawnTimer;
 
-            void Initialize() override
-            {
-                SetHeaders(DataHeader);
-                memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
-
-                CageTimer = 0;
-                RespawnTimer = 0;
-            }
-
             bool IsEncounterInProgress() const override
             {
                 for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index 838297aa21f..208b7c36a5f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -39,9 +39,7 @@ class instance_shattered_halls : public InstanceMapScript
 
         struct instance_shattered_halls_InstanceMapScript : public InstanceScript
         {
-            instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map) { }
-
-            void Initialize() override
+            instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map)
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
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)