diff options
Diffstat (limited to 'src')
71 files changed, 363 insertions, 360 deletions
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index 3be95a86ca8..f8c9e888176 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -1623,7 +1623,7 @@ void BattlegroundAV::ResetBGSubclass() bool BattlegroundAV::CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* source, Unit const* target, uint32 miscValue) { - uint8 team = source->GetTeam(); + uint32 team = source->GetTeam(); switch (criteriaId) { case BG_CRITERIA_CHECK_EVERYTHING_COUNTS: 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 b9ff40f8285..a080e117583 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp @@ -115,7 +115,7 @@ public: uint32 TombTimer; uint32 TombEventCounter; - void Initialize() + void Initialize() OVERRIDE { memset(&encounter, 0, sizeof(encounter)); @@ -156,7 +156,7 @@ public: TombBossGUIDs[i] = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -178,7 +178,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -342,12 +342,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) { @@ -429,7 +429,7 @@ public: TombEventStarterGUID = 0; SetData(TYPE_TOMB_OF_SEVEN, DONE); } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { if (TombEventStarterGUID && GhostKillCount < 7) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index f0d252a5c5e..9b250cc169a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -75,7 +75,7 @@ public: go_portcullis_tobossrooms = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -133,7 +133,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -240,7 +240,7 @@ public: } } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -270,7 +270,7 @@ public: return true; } - void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) + void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) OVERRIDE { switch (eventId) { @@ -414,7 +414,7 @@ public: return 0; } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { Events.Update(diff); @@ -531,7 +531,7 @@ public: } } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -542,7 +542,7 @@ public: return saveStream.str(); } - void Load(const char* strIn) + void Load(const char* strIn) OVERRIDE { if (!strIn) { 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 d904e0a89f8..622c34d3358 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp @@ -59,7 +59,7 @@ public: SetBossNumber(EncounterCount); } - void Initialize() + void Initialize() OVERRIDE { // Razorgore EggCount = 0; @@ -85,7 +85,7 @@ public: NefarianGUID = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -126,7 +126,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -159,13 +159,13 @@ public: } } - void OnGameObjectRemove(GameObject* go) + void OnGameObjectRemove(GameObject* go) OVERRIDE { if (go->GetEntry() == 177807) // Egg EggList.remove(go->GetGUID()); } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -268,14 +268,14 @@ public: } } - void OnUnitDeath(Unit* unit) + void OnUnitDeath(Unit* unit) OVERRIDE { //! HACK, needed because of buggy CreatureAI after charm if (unit->GetEntry() == NPC_RAZORGORE && GetBossState(BOSS_RAZORGORE) != DONE) SetBossState(BOSS_RAZORGORE, DONE); } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { if (_events.Empty()) return; 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 04e652b7f80..73ea15be261 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp @@ -79,7 +79,7 @@ class instance_molten_core : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -94,7 +94,7 @@ class instance_molten_core : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -183,7 +183,7 @@ class instance_molten_core : public InstanceMapScript summon->AI()->DoAction(ACTION_START_RAGNAROS_ALT); } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index b9073a35abf..7e7d1b72415 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -72,7 +72,7 @@ class instance_deadmines : public InstanceMapScript uint32 PiratesDelay_Timer; uint64 uiSmiteChestGUID; - void Initialize() + void Initialize() OVERRIDE { FactoryDoorGUID = 0; IronCladDoorGUID = 0; @@ -86,7 +86,7 @@ class instance_deadmines : public InstanceMapScript uiSmiteChestGUID = 0; } - virtual void Update(uint32 diff) + virtual void Update(uint32 diff) OVERRIDE { if (!IronCladDoorGUID || !DefiasCannonGUID || !DoorLeverGUID) return; @@ -188,7 +188,7 @@ class instance_deadmines : public InstanceMapScript pDoorLever->SetUInt32Value(GAMEOBJECT_FLAGS, 4); } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index a00e9d9abe5..bd24c87539e 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -45,7 +45,7 @@ public: uint64 uiBastmasterEmiShortfuseGUID; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -55,7 +55,7 @@ public: uiBastmasterEmiShortfuseGUID = 0; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { @@ -77,7 +77,7 @@ public: OUT_LOAD_INST_DATA_COMPLETE; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -85,7 +85,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index eef61f0c051..82dc85861da 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -80,7 +80,7 @@ public: uint64 ImageGUID; uint64 DustCoveredChest; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -108,7 +108,7 @@ public: DustCoveredChest = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -117,7 +117,7 @@ public: return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -190,7 +190,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -236,7 +236,7 @@ public: } } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { return strSaveData; } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index 2350cd8f581..ba3526bfa11 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -86,7 +86,7 @@ public: uint32 StatuesState; uint8 felCristalIndex; - void Initialize() + void Initialize() OVERRIDE { memset(&Encounter, 0, sizeof(Encounter)); @@ -108,7 +108,7 @@ public: felCristalIndex = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (Encounter[i] == IN_PROGRESS) @@ -188,7 +188,7 @@ public: SaveToDB(); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -204,7 +204,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -235,7 +235,7 @@ public: } } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -246,7 +246,7 @@ public: return saveStream.str(); } - void Load(const char* str) + void Load(const char* str) OVERRIDE { if (!str) { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 3bd00cf243f..05664a946ed 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -63,7 +63,7 @@ public: uint32 encounter[MAX_ENCOUNTER]; - void Initialize() + void Initialize() OVERRIDE { memset(&encounter, 0, sizeof(encounter)); @@ -78,7 +78,7 @@ public: DoorHighInquisitorGUID = 0; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -87,7 +87,7 @@ public: } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index abe79a89522..ad0ae3998f1 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -48,7 +48,7 @@ class instance_scholomance : public InstanceMapScript BrazierOfTheHeraldGUID = 0; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -84,7 +84,7 @@ class instance_scholomance : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -168,7 +168,7 @@ class instance_scholomance : public InstanceMapScript instance->SummonCreature(NPC_DARKMASTER_GANDLING, GandlingLoc); } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -179,7 +179,7 @@ class instance_scholomance : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) + void Load(const char* str) OVERRIDE { if (!str) { diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 346c9f0f038..fde5bffd07a 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -94,7 +94,7 @@ public: uint8 uiPhase; uint16 uiTimer; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -110,7 +110,7 @@ public: uiTimer = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -120,7 +120,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -218,12 +218,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/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index b0d5b0508eb..85eabe70cfa 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -72,7 +72,7 @@ class instance_stratholme : public InstanceMapScript std::set<uint64> abomnationGUID; EventMap events; - void Initialize() + void Initialize() OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) EncounterState[i] = NOT_STARTED; @@ -126,7 +126,7 @@ class instance_stratholme : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -146,7 +146,7 @@ class instance_stratholme : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) + void OnCreatureRemove(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -160,7 +160,7 @@ class instance_stratholme : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -353,7 +353,7 @@ class instance_stratholme : public InstanceMapScript SaveToDB(); } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -365,7 +365,7 @@ class instance_stratholme : public InstanceMapScript return saveStream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { @@ -426,7 +426,7 @@ class instance_stratholme : public InstanceMapScript return 0; } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { events.Update(diff); diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 2239b4a6ed3..b2afee86774 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -79,7 +79,7 @@ public: bool s5; bool s6; - void Initialize() + void Initialize() OVERRIDE { GOAtalaiStatue1 = 0; GOAtalaiStatue2 = 0; @@ -99,7 +99,7 @@ public: s6 = false; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index ac5adde9e73..f1febf07bb7 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -81,7 +81,7 @@ public: uint32 SpectralRealmTimer; std::vector<uint64> SpectralRealmList; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -113,7 +113,7 @@ public: SpectralRealmTimer = 5000; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -141,7 +141,7 @@ public: return NULL; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -161,7 +161,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -272,7 +272,7 @@ public: SaveToDB(); } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; std::ostringstream stream; @@ -283,7 +283,7 @@ public: return stream.str(); } - void Load(char const* in) + void Load(char const* in) OVERRIDE { if (!in) { diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 7da755b5313..7d17a339d5f 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -47,7 +47,7 @@ class instance_uldaman : public InstanceMapScript { instance_uldaman_InstanceMapScript(Map* map) : InstanceScript(map) {} - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -67,7 +67,7 @@ class instance_uldaman : public InstanceMapScript keystoneCheck = false; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -99,7 +99,7 @@ class instance_uldaman : public InstanceMapScript uint32 m_auiEncounter[MAX_ENCOUNTER]; std::string str_data; - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -308,7 +308,7 @@ class instance_uldaman : public InstanceMapScript } } } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { if (!keystoneCheck) return; @@ -403,12 +403,12 @@ class instance_uldaman : public InstanceMapScript } } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { return str_data; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { @@ -430,7 +430,7 @@ class instance_uldaman : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -494,7 +494,7 @@ class instance_uldaman : public InstanceMapScript return 0; } // end GetData64 - void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) + void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) OVERRIDE { switch (eventId) { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 8068238b12e..5803f1b981c 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -90,7 +90,7 @@ class instance_zulaman : public InstanceMapScript uint32 m_auiEncounter[MAX_ENCOUNTER]; uint32 RandVendor[RAND_VENDOR]; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -119,7 +119,7 @@ class instance_zulaman : public InstanceMapScript m_auiEncounter[DATA_GONGEVENT] = NOT_STARTED; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -134,7 +134,7 @@ class instance_zulaman : public InstanceMapScript instance->SummonCreature(NPC_HARRISON_JONES, HarrisonJonesLoc); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -151,7 +151,7 @@ class instance_zulaman : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -201,7 +201,7 @@ class instance_zulaman : public InstanceMapScript HandleGameObject(ZulJinGateGUID, true); } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -331,7 +331,7 @@ class instance_zulaman : public InstanceMapScript } } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { if (QuestMinute) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index 27e1150818e..797695a70f3 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -38,7 +38,7 @@ class instance_zulgurub : public InstanceMapScript SetBossNumber(EncounterCount); } - void Initialize() + void Initialize() OVERRIDE { _zealotLorkhanGUID = 0; _zealotZathGUID = 0; @@ -50,13 +50,13 @@ class instance_zulgurub : public InstanceMapScript _goGongOfBethekkGUID = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { // not active in Zul'Gurub return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -81,7 +81,7 @@ class instance_zulgurub : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -129,7 +129,7 @@ class instance_zulgurub : public InstanceMapScript return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -140,7 +140,7 @@ class instance_zulgurub : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) + void Load(const char* str) OVERRIDE { if (!str) { diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 655fa65f2f2..5d4b0797081 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -721,7 +721,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript orphanGUID = 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { // Existing SmartAI if (type == 0) 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 65b146e4770..5f425f780cb 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -56,7 +56,7 @@ public: { instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map) {} - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -80,7 +80,7 @@ public: ArchiYell = false; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < EncounterCount; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -89,7 +89,7 @@ public: return false; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -113,7 +113,7 @@ public: } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -282,12 +282,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/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()) { diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index 655a1d94e59..a7b82583d08 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -66,7 +66,7 @@ public: std::string str_data; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); InitiandGUIDs.clear(); @@ -86,7 +86,7 @@ public: JedogaTarget = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -95,7 +95,7 @@ public: return false; } - 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()) { @@ -276,7 +276,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -291,7 +291,7 @@ public: return str_data; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 65f817f148d..261a2748579 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -48,7 +48,7 @@ public: uint32 auiEncounter[MAX_ENCOUNTER]; - void Initialize() + void Initialize() OVERRIDE { memset(&auiEncounter, 0, sizeof(auiEncounter)); memset(&uiAnubarakDoor, 0, sizeof(uiAnubarakDoor)); @@ -62,7 +62,7 @@ public: uiKrikthirDoor = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (auiEncounter[i] == IN_PROGRESS) @@ -71,7 +71,7 @@ public: return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -84,7 +84,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -161,7 +161,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -173,7 +173,7 @@ public: return saveStream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 b1d03b58bc9..f5ef0f7cab3 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -49,7 +49,7 @@ public: bool m_bShadronKilled; bool m_bVesperonKilled; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -63,7 +63,7 @@ public: m_bVesperonKilled = false; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -72,7 +72,7 @@ public: return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index 15e7c8227e9..d6c71889962 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -67,7 +67,7 @@ class instance_ruby_sanctum : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -112,7 +112,7 @@ class instance_ruby_sanctum : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -155,7 +155,7 @@ class instance_ruby_sanctum : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) + void OnGameObjectRemove(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -167,7 +167,7 @@ class instance_ruby_sanctum : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) + void OnUnitDeath(Unit* unit) OVERRIDE { Creature* creature = unit->ToCreature(); if (!creature) @@ -224,7 +224,7 @@ class instance_ruby_sanctum : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -294,7 +294,7 @@ class instance_ruby_sanctum : public InstanceMapScript return BaltharusSharedHealth; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -305,14 +305,14 @@ class instance_ruby_sanctum : public InstanceMapScript return saveStream.str(); } - void FillInitialWorldStates(WorldPacket& data) + void FillInitialWorldStates(WorldPacket& data) OVERRIDE { data << uint32(WORLDSTATE_CORPOREALITY_MATERIAL) << uint32(50); data << uint32(WORLDSTATE_CORPOREALITY_TWILIGHT) << uint32(50); data << uint32(WORLDSTATE_CORPOREALITY_TOGGLE) << uint32(0); } - void Load(char const* str) + void Load(char const* str) OVERRIDE { if (!str) { 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 8aa5060609f..78ee6ba1c6b 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 @@ -66,7 +66,7 @@ public: bool bDone; - void Initialize() + void Initialize() OVERRIDE { uiMovementDone = 0; uiGrandChampionsDeaths = 0; @@ -90,7 +90,7 @@ public: memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) { @@ -101,7 +101,7 @@ public: return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { Map::PlayerList const &players = instance->GetPlayers(); uint32 TeamInInstance = 0; @@ -152,7 +152,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -282,7 +282,7 @@ public: } } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -301,7 +301,7 @@ public: return str_data; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 6011b457a1c..43e696f3b3c 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 @@ -31,7 +31,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript { instance_trial_of_the_crusader_InstanceMapScript(Map* map) : InstanceScript(map) {} - void Initialize() + void Initialize() OVERRIDE { SetBossNumber(MAX_ENCOUNTERS); TrialCounter = 50; @@ -69,7 +69,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript FloorGUID = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i) if (GetBossState(i) == IN_PROGRESS) @@ -82,7 +82,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript return false; } - void OnPlayerEnter(Player* player) + void OnPlayerEnter(Player* player) OVERRIDE { if (instance->IsHeroic()) { @@ -122,7 +122,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript go->SetGoState(GO_STATE_READY); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -179,7 +179,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -227,7 +227,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -629,7 +629,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript return 0; } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { if (GetData(TYPE_NORTHREND_BEASTS) == SNAKES_SPECIAL && NotOneButTwoJormungarsTimer) { @@ -665,12 +665,12 @@ class instance_trial_of_the_crusader : public InstanceMapScript NeedSave = false; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { return SaveDataBuffer; } - void Load(const char* strIn) + void Load(const char* strIn) OVERRIDE { if (!strIn) { @@ -697,7 +697,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) + bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) OVERRIDE { switch (criteria_id) { 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 e2ed883ad08..240e27ad026 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -170,7 +170,7 @@ class instance_drak_tharon_keep : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) OVERRIDE OVERRIDE { if (!str) { 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 ca4a9c43e60..ae57732e9e2 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 @@ -43,7 +43,7 @@ class instance_forge_of_souls : public InstanceMapScript teamInInstance = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) @@ -101,7 +101,7 @@ class instance_forge_of_souls : public InstanceMapScript return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -112,7 +112,7 @@ class instance_forge_of_souls : public InstanceMapScript return saveStream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 a026a6636d4..40110b8a509 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 @@ -510,7 +510,7 @@ public: return saveStream.str(); } - void Load(char const* in) OVERRIDE + void Load(char const* in) OVERRIDE OVERRIDE { if (!in) { 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 5efc2e6afaf..a789d0c6a70 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 @@ -53,13 +53,13 @@ class instance_pit_of_saron : public InstanceMapScript _teamInInstance = 0; } - void OnPlayerEnter(Player* player) + void OnPlayerEnter(Player* player) OVERRIDE { if (!_teamInInstance) _teamInInstance = player->GetTeam(); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { if (!_teamInInstance) { @@ -164,7 +164,7 @@ class instance_pit_of_saron : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -175,7 +175,7 @@ class instance_pit_of_saron : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) + void OnGameObjectRemove(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -186,7 +186,7 @@ class instance_pit_of_saron : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -264,7 +264,7 @@ class instance_pit_of_saron : public InstanceMapScript return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -275,7 +275,7 @@ class instance_pit_of_saron : public InstanceMapScript return saveStream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 681ffff46b3..780ab6358a6 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -89,7 +89,7 @@ public: std::string str_data; - void Initialize() + void Initialize() OVERRIDE { spawnSupport = false; @@ -133,7 +133,7 @@ public: memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -142,7 +142,7 @@ public: return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -168,7 +168,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -384,7 +384,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -401,7 +401,7 @@ public: return str_data; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { @@ -440,7 +440,7 @@ public: OUT_LOAD_INST_DATA_COMPLETE; } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { // Spawn the support for the bridge if necessary if (spawnSupport) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index d1a0e1a3e26..9a2781a5bcb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -151,7 +151,7 @@ class instance_icecrown_citadel : public InstanceMapScript BloodQuickeningMinutes = 0; } - void FillInitialWorldStates(WorldPacket& data) + void FillInitialWorldStates(WorldPacket& data) OVERRIDE { data << uint32(WORLDSTATE_SHOW_TIMER) << uint32(BloodQuickeningState == IN_PROGRESS); data << uint32(WORLDSTATE_EXECUTION_TIME) << uint32(BloodQuickeningMinutes); @@ -160,13 +160,13 @@ class instance_icecrown_citadel : public InstanceMapScript data << uint32(WORLDSTATE_ATTEMPTS_MAX) << uint32(MaxHeroicAttempts); } - void OnPlayerEnter(Player* player) + void OnPlayerEnter(Player* player) OVERRIDE { if (!TeamInInstance) TeamInInstance = player->GetTeam(); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { if (!TeamInInstance) { @@ -309,7 +309,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) + void OnCreatureRemove(Creature* creature) OVERRIDE { if (creature->GetEntry() == NPC_SINDRAGOSA) SindragosaGUID = 0; @@ -348,7 +348,7 @@ class instance_icecrown_citadel : public InstanceMapScript return entry; } - void OnUnitDeath(Unit* unit) + void OnUnitDeath(Unit* unit) OVERRIDE { Creature* creature = unit->ToCreature(); if (!creature) @@ -406,7 +406,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -558,7 +558,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) + void OnGameObjectRemove(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -683,7 +683,7 @@ class instance_icecrown_citadel : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -912,7 +912,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) + bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) OVERRIDE { switch (criteria_id) { @@ -952,7 +952,7 @@ class instance_icecrown_citadel : public InstanceMapScript return false; } - bool CheckRequiredBosses(uint32 bossId, Player const* player = NULL) const + bool CheckRequiredBosses(uint32 bossId, Player const* player = NULL) const OVERRIDE { if (player && player->GetSession()->HasPermission(RBAC_PERM_SKIP_CHECK_INSTANCE_REQUIRED_BOSSES)) return true; @@ -1107,7 +1107,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -1119,7 +1119,7 @@ class instance_icecrown_citadel : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) + void Load(const char* str) OVERRIDE { if (!str) { @@ -1161,7 +1161,7 @@ class instance_icecrown_citadel : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { if (BloodQuickeningState != IN_PROGRESS && GetBossState(DATA_THE_LICH_KING) != IN_PROGRESS) return; @@ -1219,7 +1219,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - void ProcessEvent(WorldObject* /*source*/, uint32 eventId) + void ProcessEvent(WorldObject* /*source*/, uint32 eventId) OVERRIDE { switch (eventId) { diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index fa50e478d5a..57f36ddc3a4 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -131,7 +131,7 @@ class instance_naxxramas : public InstanceMapScript memset(PortalsGUID, 0, sizeof(PortalsGUID)); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -175,12 +175,12 @@ class instance_naxxramas : public InstanceMapScript AddMinion(creature, true); } - void OnCreatureRemove(Creature* creature) + void OnCreatureRemove(Creature* creature) OVERRIDE { AddMinion(creature, false); } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287) { @@ -220,7 +220,7 @@ class instance_naxxramas : public InstanceMapScript AddDoor(go, true); } - void OnGameObjectRemove(GameObject* go) + void OnGameObjectRemove(GameObject* go) OVERRIDE { if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287) { @@ -247,7 +247,7 @@ class instance_naxxramas : public InstanceMapScript AddDoor(go, false); } - void OnUnitDeath(Unit* unit) + void OnUnitDeath(Unit* unit) OVERRIDE { if (unit->GetTypeId() == TYPEID_PLAYER && IsEncounterInProgress()) { @@ -344,7 +344,7 @@ class instance_naxxramas : public InstanceMapScript return 0; } - bool SetBossState(uint32 id, EncounterState state) + bool SetBossState(uint32 id, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(id, state)) return false; @@ -427,7 +427,7 @@ class instance_naxxramas : public InstanceMapScript return false; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -438,7 +438,7 @@ class instance_naxxramas : public InstanceMapScript return saveStream.str(); } - void Load(const char* strIn) + void Load(const char* strIn) OVERRIDE { if (!strIn) { diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index ef3162d892e..4da66452d48 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -96,7 +96,7 @@ enum Spells SPELL_PORTAL_BEAM = 56046, // Malygos cast on portal to activate it during PHASE_NOT_STARTED //Phase I - SPELL_BERSEKER = 60670, + SPELL_BERSERK = 60670, SPELL_MALYGOS_BERSERK = 47008, // it's the berserk spell that will hit only Malygos after 10 min of 60670 SPELL_PORTAL_VISUAL_CLOSED = 55949, SPELL_SUMMON_POWER_PARK = 56142, @@ -580,7 +580,7 @@ public: } Talk(SAY_START_P_ONE); - DoCast(SPELL_BERSEKER); // periodic aura, first tick in 10 minutes + DoCast(SPELL_BERSERK); // periodic aura, first tick in 10 minutes if (instance) instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } 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 15d86cc9f25..a1511fb3dd8 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 @@ -48,7 +48,7 @@ public: alexstraszaBunnyGUID = 0; }; - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -94,7 +94,7 @@ public: instance->AddToMap(go); } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -130,7 +130,7 @@ public: } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -152,7 +152,7 @@ public: } } - void OnUnitDeath(Unit* unit) + void OnUnitDeath(Unit* unit) OVERRIDE { if (unit->GetTypeId() != TYPEID_PLAYER) return; @@ -278,7 +278,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -289,7 +289,7 @@ public: return saveStream.str(); } - void Load(const char* str) + void Load(const char* str) OVERRIDE { if (!str) { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 507e75b95f4..4df7109c16c 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -53,7 +53,7 @@ public: std::string strInstData; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -64,7 +64,7 @@ public: TelestrasContainmentSphere = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { Map::PlayerList const &players = instance->GetPlayers(); uint32 TeamInInstance = 0; @@ -126,7 +126,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -234,7 +234,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { return strInstData; } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index d1f0105daf1..428d24a38ea 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -43,7 +43,7 @@ public: { instance_oculus_InstanceMapScript(Map* map) : InstanceScript(map) {} - void Initialize() + void Initialize() OVERRIDE { SetBossNumber(MAX_ENCOUNTER); @@ -65,7 +65,7 @@ public: verdisaGUID = 0; } - void OnUnitDeath(Unit* unit) + void OnUnitDeath(Unit* unit) OVERRIDE { Creature* creature = unit->ToCreature(); if (!creature) @@ -81,7 +81,7 @@ public: varos->RemoveAllAuras(); } - void OnPlayerEnter(Player* player) + void OnPlayerEnter(Player* player) OVERRIDE { if (GetBossState(DATA_DRAKOS_EVENT) == DONE && GetBossState(DATA_VAROS_EVENT) != DONE) { @@ -108,7 +108,7 @@ public: drake->AI()->DoAction(ACTION_CALL_DRAGON_EVENT); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -171,7 +171,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -191,7 +191,7 @@ public: } } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -304,7 +304,7 @@ public: gwhelp->SetPhaseMask(1, true); } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -317,7 +317,7 @@ public: return str_data; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 ab92d3e4616..e6d2ededd73 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 @@ -61,7 +61,7 @@ public: uint64 m_uiLokenDoorGUID; uint64 m_uiLokenGlobeGUID; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -77,7 +77,7 @@ public: m_uiLokenGlobeGUID = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -96,7 +96,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -206,7 +206,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -218,7 +218,7 @@ public: return saveStream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 b84d96a6712..d4b8750dbba 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 @@ -65,7 +65,7 @@ public: std::string str_data; - void Initialize() + void Initialize() OVERRIDE { uiMaidenOfGrief = 0; uiKrystallus = 0; @@ -90,7 +90,7 @@ public: m_auiEncounter[i] = NOT_STARTED; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -104,7 +104,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -221,7 +221,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -234,7 +234,7 @@ public: return str_data; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 13608285b08..8691f9769fa 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -110,7 +110,7 @@ class instance_ulduar : public InstanceMapScript std::set<uint64> mRubbleSpawns; - void Initialize() + void Initialize() OVERRIDE { SetBossNumber(MAX_ENCOUNTER); LoadDoorData(doorData); @@ -172,13 +172,13 @@ class instance_ulduar : public InstanceMapScript memset(_summonYSKeeper, false, sizeof(_summonYSKeeper)); } - void FillInitialWorldStates(WorldPacket& packet) + void FillInitialWorldStates(WorldPacket& packet) OVERRIDE { packet << uint32(WORLD_STATE_ALGALON_TIMER_ENABLED) << uint32(_algalonTimer && _algalonTimer <= 60); packet << uint32(WORLD_STATE_ALGALON_DESPAWN_TIMER) << uint32(std::min<uint32>(_algalonTimer, 60)); } - void OnPlayerEnter(Player* player) + void OnPlayerEnter(Player* player) OVERRIDE { if (!TeamInInstance) TeamInInstance = player->GetTeam(); @@ -226,7 +226,7 @@ class instance_ulduar : public InstanceMapScript instance->SummonCreature(NPC_MIMIRON_YS, YSKeepersPos[3]); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { if (!TeamInInstance) { @@ -419,7 +419,7 @@ class instance_ulduar : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) + void OnCreatureRemove(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -569,7 +569,7 @@ class instance_ulduar : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* gameObject) + void OnGameObjectRemove(GameObject* gameObject) OVERRIDE { switch (gameObject->GetEntry()) { @@ -587,7 +587,7 @@ class instance_ulduar : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) + void OnUnitDeath(Unit* unit) OVERRIDE { Creature* creature = unit->ToCreature(); if (!creature) @@ -614,7 +614,7 @@ class instance_ulduar : public InstanceMapScript } } - void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) + void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) OVERRIDE { // Flame Leviathan's Tower Event triggers Creature* FlameLeviathan = instance->GetCreature(LeviathanGUID); @@ -648,7 +648,7 @@ class instance_ulduar : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -951,7 +951,7 @@ class instance_ulduar : public InstanceMapScript return 0; } - bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const*, Unit const* /* = NULL */, uint32 /* = 0 */) + bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const*, Unit const* /* = NULL */, uint32 /* = 0 */) OVERRIDE { switch (criteriaId) { @@ -986,7 +986,7 @@ class instance_ulduar : public InstanceMapScript return false; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -1000,7 +1000,7 @@ class instance_ulduar : public InstanceMapScript return saveStream.str(); } - void Load(char const* strIn) + void Load(char const* strIn) OVERRIDE { if (!strIn) { @@ -1066,7 +1066,7 @@ class instance_ulduar : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { if (_events.Empty()) return; 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 ad7817daeb0..92857ce06db 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -78,7 +78,7 @@ public: uint32 forge_event[3]; std::string str_data; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -99,7 +99,7 @@ public: portcullis[1] = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -125,7 +125,7 @@ public: return NULL; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -136,7 +136,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -259,7 +259,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -273,7 +273,7 @@ public: return str_data; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp index 4b73458e72f..0277c21cb83 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -71,7 +71,7 @@ public: std::string str_data; - void Initialize() + void Initialize() OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) m_auiEncounter[i] = NOT_STARTED; @@ -95,7 +95,7 @@ public: uiSacrificedPlayer = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -104,7 +104,7 @@ public: return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -121,7 +121,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -213,7 +213,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -227,7 +227,7 @@ public: return str_data; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 bdb2f7e88f1..77fc0877056 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -44,7 +44,7 @@ class instance_archavon : public InstanceMapScript KoralonDeath = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -74,7 +74,7 @@ class instance_archavon : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -103,7 +103,7 @@ class instance_archavon : public InstanceMapScript return true; } - bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) + bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) OVERRIDE { switch (criteria_id) { diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 483d243c51d..025e93ac8d9 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -168,7 +168,7 @@ public: std::string str_data; - void Initialize() + void Initialize() OVERRIDE { uiMoragg = 0; uiErekem = 0; @@ -218,7 +218,7 @@ public: memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -227,7 +227,7 @@ public: return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -272,7 +272,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -615,7 +615,7 @@ public: } } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -632,7 +632,7 @@ public: return str_data; } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { @@ -681,7 +681,7 @@ public: return true; } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { if (!instance->HavePlayers()) return; diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 5e9a19685bc..7281c8a5b1e 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -1460,9 +1460,9 @@ public: _events.ScheduleEvent(EVENT_TURN_TO_POT, urand(15000, 26000)); } - void SetData(uint32 Type, uint32 Data) OVERRIDE + void SetData(uint32 type, uint32 data) OVERRIDE { - if (Type == 1 && Data == 1) + if (type == 1 && data == 1) switch (_getingredienttry) { case 2: 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 67f4dc1423a..f380914506e 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -44,13 +44,13 @@ public: SetBossNumber(EncounterCount); } - void Initialize() + void Initialize() OVERRIDE { SetBossState(DATA_ANZU, NOT_STARTED); iIkissDoorGUID = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { if (creature->GetEntry() == NPC_ANZU) { @@ -61,13 +61,13 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { if (go->GetEntry() == GO_IKISS_DOOR) iIkissDoorGUID = go->GetGUID(); } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -89,7 +89,7 @@ public: return true; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -100,7 +100,7 @@ public: return saveStream.str(); } - void Load(const char* str) + void Load(const char* str) OVERRIDE { if (!str) { 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 6e579003262..9a507979d8d 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -57,7 +57,7 @@ public: uint64 m_uiGrandmasterVorpil; uint32 m_uiFelOverseerCount; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -68,7 +68,7 @@ public: m_uiFelOverseerCount = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < EncounterCount; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -77,7 +77,7 @@ public: return false; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -94,7 +94,7 @@ public: } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -194,12 +194,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/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 2a82810a3c1..bd70ce012ba 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -83,7 +83,7 @@ public: uint64 IllidanGate; uint64 IllidanDoor[2]; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -115,7 +115,7 @@ public: IllidanDoor[1] = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < EncounterCount; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -141,7 +141,7 @@ public: return NULL; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -160,7 +160,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -364,12 +364,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/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 79e89740b2d..7590faee1db 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -89,7 +89,7 @@ class instance_serpent_shrine : public InstanceMapScript { } - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -122,7 +122,7 @@ class instance_serpent_shrine : public InstanceMapScript } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -131,7 +131,7 @@ class instance_serpent_shrine : public InstanceMapScript return false; } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { //Water checks if (WaterCheckTimer <= diff) @@ -191,7 +191,7 @@ class instance_serpent_shrine : public InstanceMapScript FrenzySpawnTimer -= diff; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -216,7 +216,7 @@ class instance_serpent_shrine : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -392,7 +392,7 @@ class instance_serpent_shrine : public InstanceMapScript return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; std::ostringstream stream; @@ -402,7 +402,7 @@ class instance_serpent_shrine : public InstanceMapScript return stream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 f536f1af45b..56a0e3857fa 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -86,7 +86,7 @@ public: uint64 AccessPanelHydro; uint64 AccessPanelMek; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -98,7 +98,7 @@ public: AccessPanelMek = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -107,7 +107,7 @@ public: return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -117,7 +117,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -127,7 +127,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -167,7 +167,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -183,7 +183,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -197,7 +197,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -208,7 +208,7 @@ public: return stream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 3fbdfe94c05..d8399793df4 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -60,7 +60,7 @@ public: uint64 MaulgarDoor; uint64 GruulDoor; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -75,7 +75,7 @@ public: GruulDoor = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -84,7 +84,7 @@ public: return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -96,7 +96,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -166,7 +166,7 @@ public: return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; std::ostringstream stream; @@ -176,7 +176,7 @@ public: return stream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 22b1b776e40..2193d3841a6 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -77,7 +77,7 @@ class instance_blood_furnace : public InstanceMapScript uint32 m_auiEncounter[MAX_ENCOUNTER]; std::string str_data; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -114,7 +114,7 @@ class instance_blood_furnace : public InstanceMapScript BroggokLeverGUID = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -133,13 +133,13 @@ class instance_blood_furnace : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) + void OnUnitDeath(Unit* unit) OVERRIDE { if (unit && unit->GetTypeId() == TYPEID_UNIT && unit->GetEntry() == 17398) PrisonerDied(unit->GetGUID()); } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { if (go->GetEntry() == 181766) //Final exit door Door1GUID = go->GetGUID(); @@ -247,7 +247,7 @@ class instance_blood_furnace : public InstanceMapScript return str_data.c_str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { 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 98f6f194c0f..54ca34c2708 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -36,13 +36,13 @@ class instance_ramparts : public InstanceMapScript { instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map) {} - void Initialize() + void Initialize() OVERRIDE { SetBossNumber(EncounterCount); felIronChestGUID = 0; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -53,7 +53,7 @@ class instance_ramparts : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -72,7 +72,7 @@ class instance_ramparts : public InstanceMapScript return true; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -83,7 +83,7 @@ class instance_ramparts : public InstanceMapScript return saveStream.str(); } - void Load(const char* strIn) + void Load(const char* strIn) OVERRIDE { if (!strIn) { 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 efca48505a8..bfe829de9fd 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -66,7 +66,7 @@ class instance_magtheridons_lair : public InstanceMapScript uint32 CageTimer; uint32 RespawnTimer; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -79,7 +79,7 @@ class instance_magtheridons_lair : public InstanceMapScript RespawnTimer = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -88,7 +88,7 @@ class instance_magtheridons_lair : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -101,7 +101,7 @@ class instance_magtheridons_lair : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -218,7 +218,7 @@ class instance_magtheridons_lair : public InstanceMapScript return 0; } - void Update(uint32 diff) + void Update(uint32 diff) OVERRIDE { if (CageTimer) { 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 1919e74e4ee..1484c5e9127 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -41,7 +41,7 @@ class instance_shattered_halls : public InstanceMapScript { instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map) { } - void Initialize() + void Initialize() OVERRIDE { SetBossNumber(EncounterCount); nethekurseGUID = 0; @@ -114,7 +114,7 @@ class instance_shattered_halls : public InstanceMapScript return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -125,7 +125,7 @@ class instance_shattered_halls : public InstanceMapScript return saveStream.str(); } - void Load(const char* strIn) + void Load(const char* strIn) OVERRIDE { if (!strIn) { 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 e47995befff..9995efee99a 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -60,7 +60,7 @@ class instance_the_eye : public InstanceMapScript uint32 m_auiEncounter[MAX_ENCOUNTER]; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -76,7 +76,7 @@ class instance_the_eye : public InstanceMapScript AlarEventPhase = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -85,7 +85,7 @@ class instance_the_eye : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -163,7 +163,7 @@ class instance_the_eye : public InstanceMapScript return 0; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -174,7 +174,7 @@ class instance_the_eye : public InstanceMapScript return stream.str(); } - void Load(const char* in) + void Load(const char* in) OVERRIDE { if (!in) { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index 64ebef52a87..9c60c16d0af 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -57,7 +57,7 @@ class instance_mechanar : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* gameObject) + void OnGameObjectRemove(GameObject* gameObject) OVERRIDE { switch (gameObject->GetEntry()) { @@ -71,7 +71,7 @@ class instance_mechanar : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -91,7 +91,7 @@ class instance_mechanar : public InstanceMapScript return true; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -102,7 +102,7 @@ class instance_mechanar : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) + void Load(const char* str) OVERRIDE { if (!str) { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 725c5c5aa17..41b87495c93 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -75,7 +75,7 @@ class instance_arcatraz : public InstanceMapScript uint64 GoSphereGUID; uint64 MellicharGUID; - void Initialize() + void Initialize() OVERRIDE { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -91,7 +91,7 @@ class instance_arcatraz : public InstanceMapScript MellicharGUID = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const OVERRIDE { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -100,7 +100,7 @@ class instance_arcatraz : public InstanceMapScript return false; } - void OnGameObjectCreate(GameObject* go) + void OnGameObjectCreate(GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -142,7 +142,7 @@ class instance_arcatraz : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { if (creature->GetEntry() == MELLICHAR) MellicharGUID = creature->GetGUID(); 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 443a8aa55fa..1bcfc9cbb21 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp @@ -35,7 +35,7 @@ class instance_the_botanica : public InstanceMapScript WarpSplinterGUID = 0; } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -80,7 +80,7 @@ class instance_the_botanica : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) + bool SetBossState(uint32 type, EncounterState state) OVERRIDE { if (!InstanceScript::SetBossState(type, state)) return false; @@ -100,7 +100,7 @@ class instance_the_botanica : public InstanceMapScript return true; } - std::string GetSaveData() + std::string GetSaveData() OVERRIDE { OUT_SAVE_INST_DATA; @@ -111,7 +111,7 @@ class instance_the_botanica : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) + void Load(char const* str) OVERRIDE { if (!str) { diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index aac2eb0f89e..31a6af2fc1c 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -23,7 +23,10 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "CombatAI.h" +#include "Cell.h" +#include "CellImpl.h" #include "GridNotifiers.h" +#include "GridNotifiersImpl.h" enum DeathKnightSpells { |