From 9ffabae6bf2dbec8a2755f7e018fec6dcc2668c4 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 16 Jun 2018 17:24:10 +0200 Subject: [PATCH] Scripts/Misc: Use InstanceMap* in InstanceScript instead of Map* --- src/server/game/Instances/InstanceScript.cpp | 4 ++-- src/server/game/Instances/InstanceScript.h | 6 +++--- .../BlackrockCaverns/instance_blackrock_caverns.cpp | 3 +-- .../BlackrockDepths/instance_blackrock_depths.cpp | 2 +- .../BlackwingLair/instance_blackwing_lair.cpp | 2 +- .../BlackrockMountain/MoltenCore/instance_molten_core.cpp | 2 +- .../EasternKingdoms/Deadmines/instance_deadmines.cpp | 2 +- .../EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp | 2 +- .../scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp | 2 +- .../MagistersTerrace/instance_magisters_terrace.cpp | 2 +- .../ScarletMonastery/instance_scarlet_monastery.cpp | 2 +- .../EasternKingdoms/Scholomance/instance_scholomance.cpp | 2 +- .../ShadowfangKeep/instance_shadowfang_keep.cpp | 2 +- .../EasternKingdoms/Stratholme/instance_stratholme.cpp | 2 +- .../EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp | 2 +- .../SunwellPlateau/instance_sunwell_plateau.cpp | 2 +- .../EasternKingdoms/TheStockade/instance_the_stockade.cpp | 3 +-- .../scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp | 2 +- .../scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp | 3 +-- .../BlackfathomDeeps/instance_blackfathom_deeps.cpp | 2 +- .../CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp | 2 +- .../CullingOfStratholme/instance_culling_of_stratholme.cpp | 2 +- .../EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp | 2 +- .../TheBlackMorass/instance_the_black_morass.cpp | 2 +- src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp | 3 +-- src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp | 3 +-- .../scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp | 2 +- .../Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp | 3 +-- .../Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp | 2 +- .../Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp | 2 +- .../Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp | 3 +-- .../TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp | 3 +-- .../Kalimdor/WailingCaverns/instance_wailing_caverns.cpp | 2 +- .../scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp | 2 +- .../scripts/Maelstrom/Stonecore/instance_stonecore.cpp | 2 +- .../Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp | 2 +- .../AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp | 3 +-- .../ObsidianSanctum/instance_obsidian_sanctum.cpp | 3 +-- .../TrialOfTheChampion/instance_trial_of_the_champion.cpp | 2 +- .../TrialOfTheCrusader/instance_trial_of_the_crusader.cpp | 2 +- .../Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp | 2 +- .../FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp | 2 +- .../HallsOfReflection/instance_halls_of_reflection.cpp | 2 +- .../FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp | 2 +- src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp | 2 +- .../scripts/Northrend/Naxxramas/instance_naxxramas.cpp | 2 +- .../Nexus/EyeOfEternity/instance_eye_of_eternity.cpp | 2 +- src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp | 2 +- .../scripts/Northrend/Nexus/Oculus/instance_oculus.cpp | 2 +- .../Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp | 2 +- .../Ulduar/HallsOfStone/instance_halls_of_stone.cpp | 2 +- .../UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp | 3 +-- .../UtgardePinnacle/instance_utgarde_pinnacle.cpp | 3 +-- .../VaultOfArchavon/instance_vault_of_archavon.cpp | 3 +-- .../scripts/Northrend/VioletHold/instance_violet_hold.cpp | 2 +- .../Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp | 3 +-- .../Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp | 3 +-- .../Auchindoun/SethekkHalls/instance_sethekk_halls.cpp | 3 +-- .../ShadowLabyrinth/instance_shadow_labyrinth.cpp | 2 +- .../scripts/Outland/BlackTemple/instance_black_temple.cpp | 3 +-- .../SerpentShrine/instance_serpent_shrine.cpp | 2 +- .../CoilfangReservoir/SteamVault/instance_steam_vault.cpp | 3 +-- .../TheSlavePens/instance_the_slave_pens.cpp | 3 +-- .../CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp | 3 +-- .../scripts/Outland/GruulsLair/instance_gruuls_lair.cpp | 3 +-- .../HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp | 2 +- .../HellfireRamparts/instance_hellfire_ramparts.cpp | 2 +- .../MagtheridonsLair/instance_magtheridons_lair.cpp | 2 +- .../ShatteredHalls/instance_shattered_halls.cpp | 2 +- .../scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp | 3 +-- .../Outland/TempestKeep/Mechanar/instance_mechanar.cpp | 3 +-- .../Outland/TempestKeep/arcatraz/instance_arcatraz.cpp | 3 +-- .../Outland/TempestKeep/botanica/instance_the_botanica.cpp | 3 +-- 73 files changed, 76 insertions(+), 101 deletions(-) diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 78eb27430b..621f2a18e2 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -48,7 +48,7 @@ BossBoundaryData::~BossBoundaryData() delete it->Boundary; } -InstanceScript::InstanceScript(Map* map) : instance(map), completedEncounters(0), +InstanceScript::InstanceScript(InstanceMap* map) : instance(map), completedEncounters(0), _entranceId(0), _temporaryEntranceId(0), _combatResurrectionTimer(0), _combatResurrectionCharges(0), _combatResurrectionTimerStarted(false) { #ifdef TRINITY_API_USE_DYNAMIC_LINKING @@ -63,7 +63,7 @@ _entranceId(0), _temporaryEntranceId(0), _combatResurrectionTimer(0), _combatRes void InstanceScript::SaveToDB() { - if (InstanceScenario* scenario = instance->ToInstanceMap()->GetInstanceScenario()) + if (InstanceScenario* scenario = instance->GetInstanceScenario()) scenario->SaveToDB(); std::string data = GetSaveData(); diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index e566de8233..c6f900ac65 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -34,7 +34,7 @@ class AreaBoundary; class Creature; class GameObject; -class Map; +class InstanceMap; class ModuleReference; class Player; class Unit; @@ -154,11 +154,11 @@ typedef std::map ObjectInfoMap; class TC_GAME_API InstanceScript : public ZoneScript { public: - explicit InstanceScript(Map* map); + explicit InstanceScript(InstanceMap* map); virtual ~InstanceScript() { } - Map* instance; + InstanceMap* instance; // On creation, NOT load. // PLEASE INITIALIZE FIELDS IN THE CONSTRUCTOR INSTEAD !!! diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp index daabf15b4e..dc779a50b7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "blackrock_caverns.h" #include "InstanceScript.h" -#include "Map.h" ObjectData const creatureData[] = { @@ -33,7 +32,7 @@ class instance_blackrock_caverns : public InstanceMapScript struct instance_blackrock_caverns_InstanceMapScript : public InstanceScript { - instance_blackrock_caverns_InstanceMapScript(Map* map) : InstanceScript(map) + instance_blackrock_caverns_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp index 41d7830a21..2192d88262 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp @@ -81,7 +81,7 @@ public: struct instance_blackrock_depths_InstanceMapScript : public InstanceScript { - instance_blackrock_depths_InstanceMapScript(Map* map) : InstanceScript(map) + instance_blackrock_depths_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&encounter, 0, sizeof(encounter)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp index 394b61d1a1..43f8d6ff33 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp @@ -72,7 +72,7 @@ public: struct instance_blackwing_lair_InstanceMapScript : public InstanceScript { - instance_blackwing_lair_InstanceMapScript(Map* map) : InstanceScript(map) + instance_blackwing_lair_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp index ac841bd15e..134ec2f13e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp @@ -47,7 +47,7 @@ class instance_molten_core : public InstanceMapScript struct instance_molten_core_InstanceMapScript : public InstanceScript { - instance_molten_core_InstanceMapScript(Map* map) : InstanceScript(map) + instance_molten_core_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(MAX_ENCOUNTER); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index a7552ad204..17b34da943 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -57,7 +57,7 @@ class instance_deadmines : public InstanceMapScript struct instance_deadmines_InstanceMapScript : public InstanceScript { - instance_deadmines_InstanceMapScript(Map* map) : InstanceScript(map) + instance_deadmines_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index f5c957cbdd..120d04b2b5 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -37,7 +37,7 @@ public: struct instance_gnomeregan_InstanceMapScript : public InstanceScript { - instance_gnomeregan_InstanceMapScript(Map* map) : InstanceScript(map) + instance_gnomeregan_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index ed38bcf621..49cd0deafb 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -64,7 +64,7 @@ public: struct instance_karazhan_InstanceMapScript : public InstanceScript { - instance_karazhan_InstanceMapScript(Map* map) : InstanceScript(map) + instance_karazhan_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index ca1500f000..72fc30c104 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -51,7 +51,7 @@ class instance_magisters_terrace : public InstanceMapScript struct instance_magisters_terrace_InstanceMapScript : public InstanceScript { - instance_magisters_terrace_InstanceMapScript(Map* map) : InstanceScript(map) + instance_magisters_terrace_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 111c37f5a8..b01e33734e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -35,7 +35,7 @@ class instance_scarlet_monastery : public InstanceMapScript struct instance_scarlet_monastery_InstanceMapScript : public InstanceScript { - instance_scarlet_monastery_InstanceMapScript(Map* map) : InstanceScript(map) + instance_scarlet_monastery_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 1eaf27891d..74eb8ebca5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -36,7 +36,7 @@ class instance_scholomance : public InstanceMapScript struct instance_scholomance_InstanceMapScript : public InstanceScript { - instance_scholomance_InstanceMapScript(Map* map) : InstanceScript(map) + instance_scholomance_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 6bad0759d3..f3536c6915 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -82,7 +82,7 @@ public: struct instance_shadowfang_keep_InstanceMapScript : public InstanceScript { - instance_shadowfang_keep_InstanceMapScript(Map* map) : InstanceScript(map) + instance_shadowfang_keep_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 4e1542319d..f2f5a6709d 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -51,7 +51,7 @@ class instance_stratholme : public InstanceMapScript struct instance_stratholme_InstanceMapScript : public InstanceScript { - instance_stratholme_InstanceMapScript(Map* map) : InstanceScript(map) + instance_stratholme_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 83fecb6c7e..87de5c5a84 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -60,7 +60,7 @@ public: struct instance_sunken_temple_InstanceMapScript : public InstanceScript { - instance_sunken_temple_InstanceMapScript(Map* map) : InstanceScript(map) + instance_sunken_temple_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); State = 0; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index b62cff7cc2..f79e1c6a65 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -51,7 +51,7 @@ class instance_sunwell_plateau : public InstanceMapScript struct instance_sunwell_plateau_InstanceMapScript : public InstanceScript { - instance_sunwell_plateau_InstanceMapScript(Map* map) : InstanceScript(map) + instance_sunwell_plateau_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp b/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp index 7887341e18..44b94ab840 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" #include "the_stockade.h" class instance_the_stockade : public InstanceMapScript @@ -27,7 +26,7 @@ public: struct instance_the_stockade_InstanceMapScript : public InstanceScript { - instance_the_stockade_InstanceMapScript(Map* map) : InstanceScript(map) + instance_the_stockade_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index cb92adeee5..c68906bddd 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -61,7 +61,7 @@ class instance_uldaman : public InstanceMapScript struct instance_uldaman_InstanceMapScript : public InstanceScript { - instance_uldaman_InstanceMapScript(Map* map) : InstanceScript(map) + instance_uldaman_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index 91ef8a5e7d..c3def29dba 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -20,7 +20,6 @@ #include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Map.h" #include "zulgurub.h" DoorData const doorData[] = @@ -40,7 +39,7 @@ class instance_zulgurub : public InstanceMapScript struct instance_zulgurub_InstanceMapScript : public InstanceScript { - instance_zulgurub_InstanceMapScript(Map* map) : InstanceScript(map) + instance_zulgurub_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index eb79c097ad..e984eee921 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -59,7 +59,7 @@ public: struct instance_blackfathom_deeps_InstanceMapScript : public InstanceScript { - instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map) + instance_blackfathom_deeps_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index eff538999f..f3debe9aae 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -63,7 +63,7 @@ public: struct instance_mount_hyjal_InstanceMapScript : public InstanceScript { - instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map) + instance_mount_hyjal_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); LoadObjectData(creatureData, nullptr); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 1667c0de20..4bedfd5f44 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -59,7 +59,7 @@ class instance_culling_of_stratholme : public InstanceMapScript struct instance_culling_of_stratholme_InstanceMapScript : public InstanceScript { - instance_culling_of_stratholme_InstanceMapScript(Map* map) : InstanceScript(map) + instance_culling_of_stratholme_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 8cd636a256..a139052045 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -54,7 +54,7 @@ public: struct instance_old_hillsbrad_InstanceMapScript : public InstanceScript { - instance_old_hillsbrad_InstanceMapScript(Map* map) : InstanceScript(map) + instance_old_hillsbrad_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index 7154bd11a9..3dfd129dc9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -82,7 +82,7 @@ public: struct instance_the_black_morass_InstanceMapScript : public InstanceScript { - instance_the_black_morass_InstanceMapScript(Map* map) : InstanceScript(map) + instance_the_black_morass_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); Clear(); diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index 0da7953208..add1ed5f79 100644 --- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -24,7 +24,6 @@ gets instead the deserter debuff. #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" // Bosses (East) // 0 - Pusillin @@ -58,7 +57,7 @@ public: struct instance_dire_maul_InstanceMapScript : public InstanceScript { - instance_dire_maul_InstanceMapScript(Map* map) : InstanceScript(map) + instance_dire_maul_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetBossNumber(EncounterCount); } diff --git a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp index d77afba50c..3b8bdad314 100644 --- a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp @@ -24,7 +24,6 @@ gets instead the deserter debuff. #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" #include "maraudon.h" class instance_maraudon : public InstanceMapScript @@ -39,7 +38,7 @@ public: struct instance_maraudon_InstanceMapScript : public InstanceScript { - instance_maraudon_InstanceMapScript(Map* map) : InstanceScript(map) { } + instance_maraudon_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { } }; }; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 45f6bd1bd0..f6d8ef2b6f 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -48,7 +48,7 @@ public: struct instance_onyxias_lair_InstanceMapScript : public InstanceScript { - instance_onyxias_lair_InstanceMapScript(Map* map) : InstanceScript(map) + instance_onyxias_lair_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp index bef26ca086..4d65402990 100644 --- a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp +++ b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp @@ -24,7 +24,6 @@ gets instead the deserter debuff. #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" class instance_ragefire_chasm : public InstanceMapScript { @@ -38,7 +37,7 @@ public: struct instance_ragefire_chasm_InstanceMapScript : public InstanceScript { - instance_ragefire_chasm_InstanceMapScript(Map* map) : InstanceScript(map) { } + instance_ragefire_chasm_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { } }; }; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 18077c90ab..3aaf1cb1f2 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -52,7 +52,7 @@ public: struct instance_razorfen_downs_InstanceMapScript : public InstanceScript { - instance_razorfen_downs_InstanceMapScript(Map* map) : InstanceScript(map) + instance_razorfen_downs_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 758ecb78e4..a7ed80e263 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -44,7 +44,7 @@ public: struct instance_razorfen_kraul_InstanceMapScript : public InstanceScript { - instance_razorfen_kraul_InstanceMapScript(Map* map) : InstanceScript(map) + instance_razorfen_kraul_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); WardKeeperDeath = 0; diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp index 0ee0bdc24d..85b9363bdc 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "Creature.h" #include "InstanceScript.h" -#include "Map.h" #include "ruins_of_ahnqiraj.h" class instance_ruins_of_ahnqiraj : public InstanceMapScript @@ -28,7 +27,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript struct instance_ruins_of_ahnqiraj_InstanceMapScript : public InstanceScript { - instance_ruins_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map) + instance_ruins_of_ahnqiraj_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(NUM_ENCOUNTER); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index 8b272dd4ca..7d66930a79 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -26,7 +26,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "Creature.h" #include "InstanceScript.h" -#include "Map.h" #include "temple_of_ahnqiraj.h" class instance_temple_of_ahnqiraj : public InstanceMapScript @@ -41,7 +40,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript struct instance_temple_of_ahnqiraj_InstanceMapScript : public InstanceScript { - instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map) + instance_temple_of_ahnqiraj_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); IsBossDied[0] = false; diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index 40260d9ef2..f5a307153c 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -44,7 +44,7 @@ public: struct instance_wailing_caverns_InstanceMapScript : public InstanceScript { - instance_wailing_caverns_InstanceMapScript(Map* map) : InstanceScript(map) + instance_wailing_caverns_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 08bf6693a6..6b0e7be664 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -110,7 +110,7 @@ public: struct instance_zulfarrak_InstanceMapScript : public InstanceScript { - instance_zulfarrak_InstanceMapScript(Map* map) : InstanceScript(map) + instance_zulfarrak_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); GahzRillaEncounter = NOT_STARTED; diff --git a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp index b5740ce118..d652eba6b0 100644 --- a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp @@ -53,7 +53,7 @@ class instance_stonecore : public InstanceMapScript struct instance_stonecore_InstanceScript : public InstanceScript { - instance_stonecore_InstanceScript(Map* map) : InstanceScript(map) + instance_stonecore_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(MAX_ENCOUNTER); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index 321762f5d9..e5e2b023f2 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -36,7 +36,7 @@ class instance_ahnkahet : public InstanceMapScript struct instance_ahnkahet_InstanceScript : public InstanceScript { - instance_ahnkahet_InstanceScript(Map* map) : InstanceScript(map) + instance_ahnkahet_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index fd4d88efbb..d342e2757f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -21,7 +21,6 @@ #include "Creature.h" #include "CreatureAI.h" #include "InstanceScript.h" -#include "Map.h" DoorData const doorData[] = { @@ -64,7 +63,7 @@ class instance_azjol_nerub : public InstanceMapScript struct instance_azjol_nerub_InstanceScript : public InstanceScript { - instance_azjol_nerub_InstanceScript(Map* map) : InstanceScript(map) + instance_azjol_nerub_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index c34a451198..29a105db50 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -19,7 +19,6 @@ #include "AreaBoundary.h" #include "Creature.h" #include "InstanceScript.h" -#include "Map.h" #include "obsidian_sanctum.h" /* Obsidian Sanctum encounters: @@ -38,7 +37,7 @@ public: struct instance_obsidian_sanctum_InstanceMapScript : public InstanceScript { - instance_obsidian_sanctum_InstanceMapScript(Map* map) : InstanceScript(map) + instance_obsidian_sanctum_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 18f0d26e49..234ab214bc 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -46,7 +46,7 @@ public: struct instance_trial_of_the_champion_InstanceMapScript : public InstanceScript { - instance_trial_of_the_champion_InstanceMapScript(Map* map) : InstanceScript(map) + instance_trial_of_the_champion_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); uiMovementDone = 0; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 504967f4ff..cc95ecc3db 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -42,7 +42,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript struct instance_trial_of_the_crusader_InstanceMapScript : public InstanceScript { - instance_trial_of_the_crusader_InstanceMapScript(Map* map) : InstanceScript(map) + instance_trial_of_the_crusader_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(MAX_ENCOUNTERS); diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 7e9b3b4b78..54feb02171 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -30,7 +30,7 @@ class instance_drak_tharon_keep : public InstanceMapScript struct instance_drak_tharon_keep_InstanceScript : public InstanceScript { - instance_drak_tharon_keep_InstanceScript(Map* map) : InstanceScript(map) + instance_drak_tharon_keep_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 9dc5d5bed5..aa079a5429 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -37,7 +37,7 @@ class instance_forge_of_souls : public InstanceMapScript struct instance_forge_of_souls_InstanceScript : public InstanceScript { - instance_forge_of_souls_InstanceScript(Map* map) : InstanceScript(map) + instance_forge_of_souls_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index ecd030b930..5b2f34a646 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -88,7 +88,7 @@ class instance_halls_of_reflection : public InstanceMapScript struct instance_halls_of_reflection_InstanceMapScript : public InstanceScript { - instance_halls_of_reflection_InstanceMapScript(Map* map) : InstanceScript(map) + instance_halls_of_reflection_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index bf8729ca88..4fb1bb4dcf 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -42,7 +42,7 @@ class instance_pit_of_saron : public InstanceMapScript struct instance_pit_of_saron_InstanceScript : public InstanceScript { - instance_pit_of_saron_InstanceScript(Map* map) : InstanceScript(map) + instance_pit_of_saron_InstanceScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 82f3a93c9f..62132fb2e0 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -62,7 +62,7 @@ class instance_gundrak : public InstanceMapScript struct instance_gundrak_InstanceMapScript : public InstanceScript { - instance_gundrak_InstanceMapScript(Map* map) : InstanceScript(map) + instance_gundrak_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index aa678c988a..614e30660f 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -115,7 +115,7 @@ class instance_naxxramas : public InstanceMapScript struct instance_naxxramas_InstanceMapScript : public InstanceScript { - instance_naxxramas_InstanceMapScript(Map* map) : InstanceScript(map) + instance_naxxramas_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index aa1946bef7..847f55b3e8 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -42,7 +42,7 @@ public: struct instance_eye_of_eternity_InstanceMapScript : public InstanceScript { - instance_eye_of_eternity_InstanceMapScript(Map* map) : InstanceScript(map) + instance_eye_of_eternity_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(MAX_ENCOUNTER); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 30b2d8e010..6b1f3d32f7 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -36,7 +36,7 @@ class instance_nexus : public InstanceMapScript struct instance_nexus_InstanceMapScript : public InstanceScript { - instance_nexus_InstanceMapScript(Map* map) : InstanceScript(map) + instance_nexus_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 7b83c2bc43..741128de00 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -45,7 +45,7 @@ class instance_oculus : public InstanceMapScript struct instance_oculus_InstanceMapScript : public InstanceScript { - instance_oculus_InstanceMapScript(Map* map) : InstanceScript(map) + instance_oculus_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 390882dab9..0d86c435f8 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -37,7 +37,7 @@ class instance_halls_of_lightning : public InstanceMapScript struct instance_halls_of_lightning_InstanceMapScript : public InstanceScript { - instance_halls_of_lightning_InstanceMapScript(Map* map) : InstanceScript(map) + instance_halls_of_lightning_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index 54f754a491..0c9b1a0545 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -35,7 +35,7 @@ class instance_halls_of_stone : public InstanceMapScript struct instance_halls_of_stone_InstanceMapScript : public InstanceScript { - instance_halls_of_stone_InstanceMapScript(Map* map) : InstanceScript(map) + instance_halls_of_stone_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 1bce83cfac..1c034a3ce1 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -19,7 +19,6 @@ #include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Map.h" #include "utgarde_keep.h" DoorData const doorData[] = @@ -43,7 +42,7 @@ class instance_utgarde_keep : public InstanceMapScript struct instance_utgarde_keep_InstanceMapScript : public InstanceScript { - instance_utgarde_keep_InstanceMapScript(Map* map) : InstanceScript(map) + instance_utgarde_keep_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 3f8dec321d..e4fdf4393e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -20,7 +20,6 @@ #include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Map.h" #include "utgarde_pinnacle.h" BossBoundaryData const boundaries = @@ -42,7 +41,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript struct instance_utgarde_pinnacle_InstanceMapScript : public InstanceScript { - instance_utgarde_pinnacle_InstanceMapScript(Map* map) : InstanceScript(map) + instance_utgarde_pinnacle_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index fa258874ca..96a3c62fb7 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "Creature.h" #include "InstanceScript.h" -#include "Map.h" #include "vault_of_archavon.h" /* Vault of Archavon encounters: @@ -35,7 +34,7 @@ class instance_vault_of_archavon : public InstanceMapScript struct instance_vault_of_archavon_InstanceMapScript : public InstanceScript { - instance_vault_of_archavon_InstanceMapScript(Map* map) : InstanceScript(map) + instance_vault_of_archavon_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 6feb2d27a9..985f014415 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -197,7 +197,7 @@ class instance_violet_hold : public InstanceMapScript struct instance_violet_hold_InstanceMapScript : public InstanceScript { - instance_violet_hold_InstanceMapScript(Map* map) : InstanceScript(map) + instance_violet_hold_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { SetHeaders(DataHeader); SetBossNumber(EncounterCount); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp index 5989799b25..5b50347450 100644 --- 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); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp index bb54632b94..28bd230f92 100644 --- 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); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 18e6f156b4..b8ad9908d9 100644 --- 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); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index 528f501f0a..8916aec306 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -37,7 +37,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); diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 01f18df6b9..a97a33aca0 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -21,7 +21,6 @@ #include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Map.h" #include "ScriptedCreature.h" DoorData const doorData[] = @@ -92,7 +91,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); 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 b7a0c5226b..62b177ddf6 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -88,7 +88,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)); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 89f7282c85..d022b65a2e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -20,7 +20,6 @@ #include "GameObject.h" #include "InstanceScript.h" #include "Log.h" -#include "Map.h" #include "steam_vault.h" class go_main_chambers_access_panel : public GameObjectScript @@ -61,7 +60,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); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp index 9ab9a9e3df..99e18c9180 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "Creature.h" #include "InstanceScript.h" -#include "Map.h" #include "the_slave_pens.h" class instance_the_slave_pens : public InstanceMapScript @@ -28,7 +27,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; } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp index e7983372da..b3f7d0e39a 100644 --- 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) { } }; }; diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 55e3e68201..c1ea1d367d 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -20,7 +20,6 @@ #include "GameObject.h" #include "gruuls_lair.h" #include "InstanceScript.h" -#include "Map.h" DoorData const doorData[] = { @@ -46,7 +45,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); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 09a42e462d..43e4b1ad78 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -41,7 +41,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); 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 496da536c8..f59b58c326 100644 --- 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); 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 b7e7cfb1ca..a13f42b64d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -72,7 +72,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); 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 b99d8fce85..39bd4a53c8 100644 --- 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); 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 4efcb0aecd..37b6dfab36 100644 --- 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); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index 4e0c75c448..4f11580871 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -19,7 +19,6 @@ #include "ScriptMgr.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Map.h" #include "mechanar.h" static DoorData const doorData[] = @@ -37,7 +36,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); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 42aa2c15b1..78b84b5f02 100644 --- 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); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp index f1c8d6c3c0..42f465db79 100644 --- 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); }