Core/Instances: merged some master branch commits in preparation for merging the upcomming instance save rewrite

2026-01-23 10:26:28 +01:00 · 2018-07-28 02:00:24 +02:00
parent 92ef398f56
commit 78ed8acdcc
73 changed files with 74 additions and 98 deletions
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp
@@ -18,7 +18,6 @@
 #include "ScriptMgr.h"
 #include "auchenai_crypts.h"
 #include "InstanceScript.h"
-#include "Map.h"

 class instance_auchenai_crypts : public InstanceMapScript
 {
@@ -27,7 +26,7 @@ class instance_auchenai_crypts : public InstanceMapScript

        struct instance_auchenai_crypts_InstanceMapScript : public InstanceScript
        {
-            instance_auchenai_crypts_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_auchenai_crypts_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
@@ -18,7 +18,6 @@
 #include "ScriptMgr.h"
 #include "InstanceScript.h"
 #include "mana_tombs.h"
-#include "Map.h"

 class instance_mana_tombs : public InstanceMapScript
 {
@@ -27,7 +26,7 @@ class instance_mana_tombs : public InstanceMapScript

        struct instance_mana_tombs_InstanceMapScript : public InstanceScript
        {
-            instance_mana_tombs_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_mana_tombs_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -19,7 +19,6 @@
 #include "Creature.h"
 #include "GameObject.h"
 #include "InstanceScript.h"
-#include "Map.h"
 #include "sethekk_halls.h"

 DoorData const doorData[] =
@@ -41,7 +40,7 @@ class instance_sethekk_halls : public InstanceMapScript

        struct instance_sethekk_halls_InstanceMapScript : public InstanceScript
        {
-            instance_sethekk_halls_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_sethekk_halls_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -35,7 +35,7 @@ class instance_shadow_labyrinth : public InstanceMapScript

        struct instance_shadow_labyrinth_InstanceMapScript : public InstanceScript
        {
-            instance_shadow_labyrinth_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_shadow_labyrinth_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -94,7 +94,7 @@ class instance_black_temple : public InstanceMapScript

        struct instance_black_temple_InstanceMapScript : public InstanceScript
        {
-            instance_black_temple_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_black_temple_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -95,7 +95,7 @@ class instance_serpent_shrine : public InstanceMapScript

        struct instance_serpentshrine_cavern_InstanceMapScript : public InstanceScript
        {
-            instance_serpentshrine_cavern_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_serpentshrine_cavern_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -21,7 +21,6 @@
 #include "GameObjectAI.h"
 #include "InstanceScript.h"
 #include "Log.h"
-#include "Map.h"
 #include "steam_vault.h"

 class go_main_chambers_access_panel : public GameObjectScript
@@ -69,7 +68,7 @@ class instance_steam_vault : public InstanceMapScript

        struct instance_steam_vault_InstanceMapScript : public InstanceScript
        {
-            instance_steam_vault_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_steam_vault_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp
@@ -25,7 +25,6 @@ gets instead the deserter debuff.
 #include "ScriptMgr.h"
 #include "Creature.h"
 #include "InstanceScript.h"
-#include "Map.h"
 #include "the_slave_pens.h"

 class instance_the_slave_pens : public InstanceMapScript
@@ -35,7 +34,7 @@ public:

    struct instance_the_slave_pens_InstanceMapScript : public InstanceScript
    {
-        instance_the_slave_pens_InstanceMapScript(Map* map) : InstanceScript(map)
+        instance_the_slave_pens_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
        {
            counter = DATA_FLAMECALLER_000;
        }
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp
@@ -24,7 +24,6 @@ gets instead the deserter debuff.

 #include "ScriptMgr.h"
 #include "InstanceScript.h"
-#include "Map.h"
 #include "the_underbog.h"

 class instance_the_underbog : public InstanceMapScript
@@ -39,7 +38,7 @@ public:

    struct instance_the_underbog_InstanceMapScript : public InstanceScript
    {
-        instance_the_underbog_InstanceMapScript(Map* map) : InstanceScript(map) { }
+        instance_the_underbog_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { }
    };
 };

--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -19,7 +19,6 @@
 #include "Creature.h"
 #include "gruuls_lair.h"
 #include "InstanceScript.h"
-#include "Map.h"

 DoorData const doorData[] =
 {
@@ -44,7 +43,7 @@ class instance_gruuls_lair : public InstanceMapScript

        struct instance_gruuls_lair_InstanceMapScript : public InstanceScript
        {
-            instance_gruuls_lair_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_gruuls_lair_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -40,7 +40,7 @@ class instance_blood_furnace : public InstanceMapScript

        struct instance_blood_furnace_InstanceMapScript : public InstanceScript
        {
-            instance_blood_furnace_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_blood_furnace_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -36,7 +36,7 @@ class instance_ramparts : public InstanceMapScript

        struct instance_ramparts_InstanceMapScript : public InstanceScript
        {
-            instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_ramparts_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -71,7 +71,7 @@ class instance_magtheridons_lair : public InstanceMapScript

        struct instance_magtheridons_lair_InstanceMapScript : public InstanceScript
        {
-            instance_magtheridons_lair_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_magtheridons_lair_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -53,7 +53,7 @@ class instance_shattered_halls : public InstanceMapScript

        struct instance_shattered_halls_InstanceMapScript : public InstanceScript
        {
-            instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_shattered_halls_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -26,7 +26,6 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "Creature.h"
 #include "InstanceScript.h"
-#include "Map.h"
 #include "the_eye.h"

 /* The Eye encounters:
@@ -58,7 +57,7 @@ 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(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -18,7 +18,6 @@

 #include "ScriptMgr.h"
 #include "InstanceScript.h"
-#include "Map.h"
 #include "mechanar.h"

 static DoorData const doorData[] =
@@ -36,7 +35,7 @@ class instance_mechanar : public InstanceMapScript

        struct instance_mechanar_InstanceMapScript : public InstanceScript
        {
-            instance_mechanar_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_mechanar_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -20,7 +20,6 @@
 #include "Creature.h"
 #include "GameObject.h"
 #include "InstanceScript.h"
-#include "Map.h"

 DoorData const doorData[] =
 {
@@ -36,7 +35,7 @@ class instance_arcatraz : public InstanceMapScript

        struct instance_arcatraz_InstanceMapScript : public InstanceScript
        {
-            instance_arcatraz_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_arcatraz_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
--- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
@@ -18,7 +18,6 @@
 #include "ScriptMgr.h"
 #include "Creature.h"
 #include "InstanceScript.h"
-#include "Map.h"
 #include "the_botanica.h"

 class instance_the_botanica : public InstanceMapScript
@@ -28,7 +27,7 @@ class instance_the_botanica : public InstanceMapScript

        struct instance_the_botanica_InstanceMapScript : public InstanceScript
        {
-            instance_the_botanica_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_the_botanica_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
            }