Core/Scripts: Removed double calls to InstanceScript's Initialize methods

This commit is contained in:
Shauren
2011-04-03 21:24:22 +02:00
parent 535b663280
commit 3fcb49c685
53 changed files with 50 additions and 58 deletions
@@ -79,7 +79,7 @@ public:
struct instance_blackrock_depths_InstanceMapScript : public InstanceScript
{
instance_blackrock_depths_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_blackrock_depths_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
@@ -53,7 +53,7 @@ class instance_deadmines : public InstanceMapScript
struct instance_deadmines_InstanceMapScript : public InstanceScript
{
instance_deadmines_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); };
instance_deadmines_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 FactoryDoorGUID;
uint64 IronCladDoorGUID;
@@ -34,8 +34,7 @@ public:
{
instance_gnomeregan_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
Initialize();
};
}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -55,7 +55,7 @@ public:
struct instance_karazhan_InstanceMapScript : public InstanceScript
{
instance_karazhan_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();}
instance_karazhan_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string strSaveData;
@@ -47,7 +47,7 @@ public:
struct instance_magisters_terrace_InstanceMapScript : public InstanceScript
{
instance_magisters_terrace_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();}
instance_magisters_terrace_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint32 DelrissaDeathCount;
@@ -45,7 +45,7 @@ public:
struct instance_scarlet_monastery_InstanceMapScript : public InstanceScript
{
instance_scarlet_monastery_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_scarlet_monastery_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 PumpkinShrineGUID;
uint64 HorsemanGUID;
@@ -49,7 +49,7 @@ public:
struct instance_scholomance_InstanceMapScript : public InstanceScript
{
instance_scholomance_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_scholomance_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
//Lord Alexei Barov, Doctor Theolen Krastinov, The Ravenian, Lorekeeper Polkelt, Instructor Malicia and the Lady Illucia Barov.
bool IsBossDied[6];
@@ -66,7 +66,7 @@ public:
struct instance_shadowfang_keep_InstanceMapScript : public InstanceScript
{
instance_shadowfang_keep_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_shadowfang_keep_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
@@ -53,8 +53,7 @@ public:
{
instance_sunken_temple_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
Initialize();
};
}
uint64 GOAtalaiStatue1;
uint64 GOAtalaiStatue2;
@@ -49,7 +49,7 @@ public:
struct instance_sunwell_plateau_InstanceMapScript : public InstanceScript
{
instance_sunwell_plateau_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_sunwell_plateau_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -44,8 +44,7 @@ class instance_uldaman : public InstanceMapScript
{
instance_uldaman_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
Initialize();
};
}
void Initialize()
{
@@ -61,7 +61,7 @@ class instance_zulaman : public InstanceMapScript
struct instance_zulaman_InstanceMapScript : public InstanceScript
{
instance_zulaman_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_zulaman_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 HarkorsSatchelGUID;
uint64 TanzarsTrunkGUID;
@@ -36,7 +36,7 @@ class instance_zulgurub : public InstanceMapScript
struct instance_zulgurub_InstanceMapScript : public InstanceScript
{
instance_zulgurub_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_zulgurub_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
//If all High Priest bosses were killed. Lorkhan, Zath and Ohgan are added too.
uint32 m_auiEncounter[MAX_ENCOUNTERS];
@@ -63,7 +63,7 @@ public:
struct instance_blackfathom_deeps_InstanceMapScript : public InstanceScript
{
instance_blackfathom_deeps_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_blackfathom_deeps_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 m_uiTwilightLordKelrisGUID;
uint64 m_uiShrine1GUID;
@@ -53,7 +53,7 @@ public:
struct instance_mount_hyjal_InstanceMapScript : public InstanceScript
{
instance_mount_hyjal_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_mount_hyjal_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
@@ -40,7 +40,7 @@ public:
struct instance_culling_of_stratholme_InstanceMapScript : public InstanceScript
{
instance_culling_of_stratholme_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_culling_of_stratholme_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 uiArthas;
uint64 uiMeathook;
@@ -75,7 +75,6 @@ public:
{
instance_dark_portal_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
Initialize();
}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -49,7 +49,7 @@ public:
struct instance_old_hillsbrad_InstanceMapScript : public InstanceScript
{
instance_old_hillsbrad_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_old_hillsbrad_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint32 mBarrelCount;
@@ -37,7 +37,7 @@ public:
struct instance_onyxias_lair_InstanceMapScript : public InstanceScript
{
instance_onyxias_lair_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_onyxias_lair_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
//Eruption is a BFS graph problem
//One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed
@@ -34,8 +34,7 @@ public:
{
instance_razorfen_downs_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
Initialize();
};
}
uint64 uiGongGUID;
@@ -40,7 +40,7 @@ public:
struct instance_razorfen_kraul_InstanceMapScript : public InstanceScript
{
instance_razorfen_kraul_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_razorfen_kraul_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 DoorWardGUID;
uint32 WardCheck_Timer;
@@ -48,7 +48,7 @@ public:
struct instance_ruins_of_ahn_qiraj_InstanceMapScript : public InstanceScript
{
instance_ruins_of_ahn_qiraj_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); }
instance_ruins_of_ahn_qiraj_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 uiKurinaxx;
uint64 uiRajaxx;
@@ -38,7 +38,7 @@ public:
struct instance_temple_of_ahnqiraj_InstanceMapScript : public InstanceScript
{
instance_temple_of_ahnqiraj_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_temple_of_ahnqiraj_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
//If Vem is dead...
bool IsBossDied[3];
@@ -40,7 +40,7 @@ public:
struct instance_wailing_caverns_InstanceMapScript : public InstanceScript
{
instance_wailing_caverns_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_wailing_caverns_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -99,7 +99,7 @@ public:
struct instance_zulfarrak_InstanceMapScript : public InstanceScript
{
instance_zulfarrak_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();}
instance_zulfarrak_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 GahzRillaEncounter;
uint64 ZumrahGUID;
@@ -33,7 +33,7 @@ public:
struct instance_azjol_nerub_InstanceScript : public InstanceScript
{
instance_azjol_nerub_InstanceScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_azjol_nerub_InstanceScript(Map* pMap) : InstanceScript(pMap) {}
uint64 uiKrikthir;
uint64 uiHadronox;
@@ -40,7 +40,7 @@ public:
struct instance_ahnkahet_InstanceScript : public InstanceScript
{
instance_ahnkahet_InstanceScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_ahnkahet_InstanceScript(Map* pMap) : InstanceScript(pMap) {}
uint64 Elder_Nadox;
uint64 Prince_Taldaram;
@@ -38,7 +38,7 @@ public:
struct instance_trial_of_the_champion_InstanceMapScript : public InstanceScript
{
instance_trial_of_the_champion_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();}
instance_trial_of_the_champion_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -33,7 +33,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* pMap) : InstanceScript(pMap) {Initialize();};
instance_trial_of_the_crusader_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 EncounterStatus[MAX_ENCOUNTERS];
uint32 TrialCounter;
@@ -49,7 +49,7 @@ public:
struct instance_drak_tharon_InstanceScript : public InstanceScript
{
instance_drak_tharon_InstanceScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_drak_tharon_InstanceScript(Map* pMap) : InstanceScript(pMap) {}
uint8 uiDredAchievCounter;
@@ -43,8 +43,7 @@ public:
instance_gundrak_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
bHeroicMode = pMap->IsHeroic();
Initialize();
};
}
bool bHeroicMode;
bool spawnSupport;
@@ -38,7 +38,7 @@ public:
struct instance_nexus_InstanceMapScript : public InstanceScript
{
instance_nexus_InstanceMapScript(Map *pMap) : InstanceScript(pMap) { Initialize(); }
instance_nexus_InstanceMapScript(Map *pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[NUMBER_OF_ENCOUNTERS];
@@ -38,7 +38,7 @@ public:
struct instance_oculus_InstanceMapScript : public InstanceScript
{
instance_oculus_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_oculus_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
void Initialize()
{
@@ -36,7 +36,7 @@ public:
struct instance_obsidian_sanctum_InstanceMapScript : public InstanceScript
{
instance_obsidian_sanctum_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_obsidian_sanctum_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint64 m_uiSartharionGUID;
@@ -45,7 +45,7 @@ public:
struct instance_halls_of_lightning_InstanceMapScript : public InstanceScript
{
instance_halls_of_lightning_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_halls_of_lightning_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -39,7 +39,7 @@ public:
struct instance_halls_of_stone_InstanceMapScript : public InstanceScript
{
instance_halls_of_stone_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_halls_of_stone_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 uiMaidenOfGrief;
uint64 uiKrystallus;
@@ -36,7 +36,7 @@ public:
struct instance_ulduar_InstanceMapScript : public InstanceScript
{
instance_ulduar_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { Initialize(); };
instance_ulduar_InstanceMapScript(InstanceMap* map) : InstanceScript(map) {}
uint32 uiEncounter[MAX_ENCOUNTER];
std::string m_strInstData;
@@ -60,7 +60,7 @@ public:
struct instance_utgarde_keep_InstanceMapScript : public InstanceScript
{
instance_utgarde_keep_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_utgarde_keep_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 Keleseth;
uint64 Skarvald;
@@ -46,7 +46,7 @@ public:
struct instance_pinnacle : public InstanceScript
{
instance_pinnacle(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_pinnacle(Map* pMap) : InstanceScript(pMap) {}
uint64 uiSvalaSorrowgrave;
uint64 uiGortokPalehoof;
@@ -115,7 +115,7 @@ public:
struct instance_violet_hold_InstanceMapScript : public InstanceScript
{
instance_violet_hold_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_violet_hold_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 uiMoragg;
uint64 uiErekem;
@@ -44,7 +44,7 @@ public:
struct instance_sethekk_halls_InstanceMapScript : public InstanceScript
{
instance_sethekk_halls_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_sethekk_halls_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 AnzuEncounter;
uint64 m_uiIkissDoorGUID;
@@ -50,7 +50,7 @@ public:
struct instance_shadow_labyrinth_InstanceMapScript : public InstanceScript
{
instance_shadow_labyrinth_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_shadow_labyrinth_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
@@ -52,7 +52,7 @@ public:
struct instance_black_temple_InstanceMapScript : public InstanceScript
{
instance_black_temple_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_black_temple_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
@@ -75,7 +75,6 @@ class instance_serpent_shrine : public InstanceMapScript
{
instance_serpentshrine_cavern_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
Initialize();
}
void Initialize()
@@ -73,7 +73,7 @@ public:
struct instance_steam_vault_InstanceMapScript : public InstanceScript
{
instance_steam_vault_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_steam_vault_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -45,7 +45,7 @@ public:
struct instance_gruuls_lair_InstanceMapScript : public InstanceScript
{
instance_gruuls_lair_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_gruuls_lair_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -40,7 +40,7 @@ class instance_blood_furnace : public InstanceMapScript
struct instance_blood_furnace_InstanceMapScript : public InstanceScript
{
instance_blood_furnace_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_blood_furnace_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 The_MakerGUID;
uint64 BroggokGUID;
@@ -36,7 +36,7 @@ class instance_ramparts : public InstanceMapScript
struct instance_ramparts_InstanceMapScript : public InstanceScript
{
instance_ramparts_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();}
instance_ramparts_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint64 m_uiChestNGUID;
@@ -52,7 +52,6 @@ class instance_magtheridons_lair : public InstanceMapScript
{
instance_magtheridons_lair_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
{
Initialize();
}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -39,7 +39,7 @@ class instance_shattered_halls : public InstanceMapScript
}
struct instance_shattered_halls_InstanceMapScript : public InstanceScript
{
instance_shattered_halls_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_shattered_halls_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint64 nethekurseGUID;
@@ -45,7 +45,7 @@ class instance_the_eye : public InstanceMapScript
struct instance_the_eye_InstanceMapScript : public InstanceScript
{
instance_the_eye_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
instance_the_eye_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint64 ThaladredTheDarkener;
uint64 LordSanguinar;
@@ -38,7 +38,7 @@ class instance_mechanar : public InstanceMapScript
struct instance_mechanar_InstanceMapScript : public InstanceScript
{
instance_mechanar_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); };
instance_mechanar_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];
@@ -59,7 +59,7 @@ class instance_arcatraz : public InstanceMapScript
}
struct instance_arcatraz_InstanceMapScript : public InstanceScript
{
instance_arcatraz_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); };
instance_arcatraz_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {}
uint32 m_auiEncounter[MAX_ENCOUNTER];