diff options
Diffstat (limited to 'src/server/scripts/Kalimdor')
14 files changed, 57 insertions, 57 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index c403246cc04..6aa12e8ce77 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -79,7 +79,7 @@ public: uint8 countFires; uint8 deathTimes; - void Initialize() + void Initialize() OVERRIDE { memset(&encounter, 0, sizeof(encounter)); @@ -95,7 +95,7 @@ public: deathTimes = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -108,7 +108,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 9dafc1cef31..6ef8a4acdef 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -57,7 +57,7 @@ public: { instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map) {} - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -81,7 +81,7 @@ public: ArchiYell = false; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < EncounterCount; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -90,7 +90,7 @@ public: return false; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -114,7 +114,7 @@ public: } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -284,12 +284,12 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { return str_data; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 7df66c89594..9af1486275c 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 @@ -70,7 +70,7 @@ class instance_culling_of_stratholme : public InstanceMapScript _crateCount = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (_encounterState[i] == IN_PROGRESS) @@ -79,7 +79,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return false; } - void FillInitialWorldStates(WorldPacket& data) + void FillInitialWorldStates(WorldPacket& data) OVERRIDE { data << uint32(WORLDSTATE_SHOW_CRATES) << uint32(1); data << uint32(WORLDSTATE_CRATES_REVEALED) << uint32(_crateCount); @@ -88,7 +88,7 @@ class instance_culling_of_stratholme : public InstanceMapScript data << uint32(WORLDSTATE_TIME_GUARDIAN_SHOW) << uint32(0); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -116,7 +116,7 @@ class instance_culling_of_stratholme : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -248,7 +248,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -260,7 +260,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return saveStream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 add2c57335a..0cb9c1e454d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -62,7 +62,7 @@ public: uint64 TarethaGUID; uint64 EpochGUID; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -104,7 +104,7 @@ public: } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { 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 003207eeecf..d8dfa2f5cf6 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 @@ -92,7 +92,7 @@ public: uint64 _medivhGUID; uint8 _currentRiftId; - void Initialize() + void Initialize() OVERRIDE { _medivhGUID = 0; Clear(); @@ -117,7 +117,7 @@ public: DoUpdateWorldState(WORLD_STATE_BM_RIFT, 0); } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { if (GetData(TYPE_MEDIVH) == IN_PROGRESS) return true; @@ -125,7 +125,7 @@ public: return false; } - void OnPlayerEnter(Player* player) + void OnPlayerEnter(Player* player) OVERRIDE { if (GetData(TYPE_MEDIVH) == IN_PROGRESS) return; @@ -133,7 +133,7 @@ public: player->SendUpdateWorldState(WORLD_STATE_BM, 0); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { if (creature->GetEntry() == NPC_MEDIVH) _medivhGUID = creature->GetGUID(); @@ -317,7 +317,7 @@ public: } } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { if (m_auiEncounter[1] != IN_PROGRESS) return; diff --git a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp index 473cbb61011..39c43d8d380 100644 --- a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp @@ -30,7 +30,7 @@ class instance_firelands : public InstanceMapScript { } - void Initialize() + void Initialize() OVERRIDE { SetBossNumber(EncounterCount); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp index 6c443097523..66887c69ef1 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp @@ -67,7 +67,7 @@ class instance_halls_of_origination : public InstanceMapScript _deadElementals = 0; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -104,7 +104,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) + void OnGameObjectRemove(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -125,7 +125,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -141,7 +141,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - uint32 GetData(uint32 data) const + uint32 GetData(uint32 data) const OVERRIDE { switch (data) { @@ -154,7 +154,7 @@ class instance_halls_of_origination : public InstanceMapScript return 0; } - uint64 GetData64(uint32 index) const + uint64 GetData64(uint32 index) const OVERRIDE { switch (index) { @@ -189,7 +189,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) + void OnUnitDeath(Unit* unit) OVERRIDE { Creature* creature = unit->ToCreature(); if (!creature) @@ -211,7 +211,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -222,7 +222,7 @@ class instance_halls_of_origination : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) + void Load(const char* str) OVERRIDE { if (!str) { diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index eed8ab22eb1..f9a392bb4d3 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: //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 - void Initialize() + void Initialize() OVERRIDE { SetBossNumber(EncounterCount); @@ -61,7 +61,7 @@ public: achievSheDeepBreathMore = true; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -71,7 +71,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731) { @@ -93,7 +93,7 @@ public: } } - void OnGameObjectRemove(GameObject* go) + void OnGameObjectRemove(GameObject* go) OVERRIDE { if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731) { @@ -133,7 +133,7 @@ public: FloorEruptionGUID[1].erase(floorEruptedGUID); } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -196,7 +196,7 @@ public: return 0; } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { if (GetBossState(DATA_ONYXIA) == IN_PROGRESS) { @@ -240,7 +240,7 @@ public: return false; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -251,7 +251,7 @@ public: return saveStream.str(); } - void Load(const char* strIn) + void Load(const char* strIn) OVERRIDE { if (!strIn) { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 0284cdfce62..091c7e46585 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -47,7 +47,7 @@ public: std::string str_data; - void Initialize() + void Initialize() OVERRIDE { uiGongGUID = 0; @@ -56,7 +56,7 @@ public: memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -71,7 +71,7 @@ public: return str_data; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { @@ -101,7 +101,7 @@ public: OUT_LOAD_INST_DATA_COMPLETE; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index dc2995540df..b40429af794 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -47,7 +47,7 @@ public: uint64 DoorWardGUID; int WardKeeperDeath; - void Initialize() + void Initialize() OVERRIDE { WardKeeperDeath = 0; DoorWardGUID = 0; @@ -69,7 +69,7 @@ public: return NULL; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { 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 87e0afeb8cc..52ef2a5430b 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -39,7 +39,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript _paralyzedGUID = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -101,7 +101,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; 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 29b38befe29..54845c6b746 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -56,7 +56,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript uint32 CthunPhase; - void Initialize() + void Initialize() OVERRIDE { IsBossDied[0] = false; IsBossDied[1] = false; @@ -74,7 +74,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript CthunPhase = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -99,7 +99,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript } } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { //not active in AQ40 return false; diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index c477a82d085..5c4fb7bbaba 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -48,7 +48,7 @@ public: bool yelled; uint64 NaralexGUID; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -56,7 +56,7 @@ public: NaralexGUID = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { if (creature->GetEntry() == DATA_NARALEX) NaralexGUID = creature->GetGUID(); @@ -104,7 +104,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -117,7 +117,7 @@ public: return saveStream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index de27368a227..8f5275be5cd 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -124,7 +124,7 @@ public: uint32 addGroupSize; uint32 waypoint; - void Initialize() + void Initialize() OVERRIDE { GahzRillaEncounter = NOT_STARTED; ZumrahGUID = 0; @@ -141,7 +141,7 @@ public: waypoint = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -177,7 +177,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { |