diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-29 20:14:42 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-29 20:14:42 +0200 |
| commit | 3ce6a9d5cfc723abc16635eaa3e00be29a44aa41 (patch) | |
| tree | 4a99f7cfeef59c1a339252183ccb5e8cd87225bd /src/server/scripts/Kalimdor | |
| parent | 796b77ca1236a42dbbf9b873ebc4f71d04e53862 (diff) | |
| parent | f9a6aa5479dc843f7bb8b58d027b5d6d483d3fd5 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_desolace.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/Spells/spell_generic.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_item.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_paladin.cpp
src/server/scripts/Spells/spell_priest.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warlock.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/server/scripts/World/item_scripts.cpp
Diffstat (limited to 'src/server/scripts/Kalimdor')
90 files changed, 927 insertions, 927 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index c7ef191cf8f..e7beb4cf454 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -38,7 +38,7 @@ class go_blackfathom_altar : public GameObjectScript public: go_blackfathom_altar() : GameObjectScript("go_blackfathom_altar") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { if (!player->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) player->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, player); @@ -51,7 +51,7 @@ class go_blackfathom_fire : public GameObjectScript public: go_blackfathom_fire() : GameObjectScript("go_blackfathom_fire") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); @@ -71,7 +71,7 @@ class npc_blackfathom_deeps_event : public CreatureScript public: npc_blackfathom_deeps_event() : CreatureScript("npc_blackfathom_deeps_event") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_blackfathom_deeps_eventAI>(creature); } @@ -97,7 +97,7 @@ public: bool Flee; - void Reset() OVERRIDE + void Reset() override { Flee = false; @@ -130,7 +130,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -179,7 +179,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (me->IsSummon()) //we are not a normal spawn. instance->SetData(DATA_EVENT, instance->GetData(DATA_EVENT) + 1); @@ -207,7 +207,7 @@ public: Start(false, false, 0); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -220,13 +220,13 @@ public: } } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override { DoCast(player, SPELL_TELEPORT_DARNASSUS); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_morriduneAI(creature); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index dfff92b8f05..f6c34c6b555 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -40,24 +40,24 @@ public: { boss_aku_maiAI(Creature* creature) : BossAI(creature, TYPE_AKU_MAI) { } - void Reset() OVERRIDE + void Reset() override { IsEnraged = false; _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000)); _EnterCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -90,7 +90,7 @@ public: bool IsEnraged; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_aku_maiAI(creature); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index 8d2ced59276..9e25de817fa 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -29,7 +29,7 @@ class boss_gelihast : public CreatureScript public: boss_gelihast() : CreatureScript("boss_gelihast") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_gelihastAI>(creature); } @@ -45,23 +45,23 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { netTimer = urand(2000, 4000); instance->SetData(TYPE_GELIHAST, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SetData(TYPE_GELIHAST, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetData(TYPE_GELIHAST, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 3ded27bd42a..37fac0fa7de 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -34,7 +34,7 @@ class boss_kelris : public CreatureScript public: boss_kelris() : CreatureScript("boss_kelris") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_kelrisAI>(creature); } @@ -51,26 +51,26 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { mindBlastTimer = urand(2000, 5000); sleepTimer = urand(9000, 12000); instance->SetData(TYPE_KELRIS, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetData(TYPE_KELRIS, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetData(TYPE_KELRIS, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 2c9c94d9724..940da4fcf52 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -57,7 +57,7 @@ class instance_blackfathom_deeps : public InstanceMapScript public: instance_blackfathom_deeps() : InstanceMapScript("instance_blackfathom_deeps", 48) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_blackfathom_deeps_InstanceMapScript(map); } @@ -79,7 +79,7 @@ public: uint8 countFires; uint8 deathTimes; - void Initialize() OVERRIDE + void Initialize() override { memset(&encounter, 0, sizeof(encounter)); @@ -95,7 +95,7 @@ public: deathTimes = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -108,7 +108,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -142,7 +142,7 @@ public: } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -212,7 +212,7 @@ public: } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -233,7 +233,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index e5ddcd1c2ef..ebe9939390f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -45,7 +45,7 @@ class boss_anetheron : public CreatureScript public: boss_anetheron() : CreatureScript("boss_anetheron") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_anetheronAI>(creature); } @@ -64,7 +64,7 @@ public: uint32 InfernoTimer; bool go; - void Reset() OVERRIDE + void Reset() override { damageTaken = 0; SwarmTimer = 45000; @@ -76,7 +76,7 @@ public: instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); @@ -84,13 +84,13 @@ public: Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7) { @@ -100,7 +100,7 @@ public: } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { hyjal_trashAI::JustDied(killer); if (IsEvent) @@ -108,7 +108,7 @@ public: Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsEvent) { @@ -176,7 +176,7 @@ class npc_towering_infernal : public CreatureScript public: npc_towering_infernal() : CreatureScript("npc_towering_infernal") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_towering_infernalAI>(creature); } @@ -196,33 +196,33 @@ public: uint64 AnetheronGUID; InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { DoCast(me, SPELL_INFERNO_EFFECT); ImmolationTimer = 5000; CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who)) AttackStart(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CheckTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 840cdf8cd20..c0f3ea35004 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -81,7 +81,7 @@ class npc_ancient_wisp : public CreatureScript public: npc_ancient_wisp() : CreatureScript("npc_ancient_wisp") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_ancient_wispAI>(creature); } @@ -98,7 +98,7 @@ public: uint64 ArchimondeGUID; uint32 CheckTimer; - void Reset() OVERRIDE + void Reset() override { CheckTimer = 1000; @@ -107,14 +107,14 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { damage = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CheckTimer <= diff) { @@ -138,7 +138,7 @@ class npc_doomfire : public CreatureScript public: npc_doomfire() : CreatureScript("npc_doomfire") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_doomfireAI(creature); } @@ -147,13 +147,13 @@ public: { npc_doomfireAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { damage = 0; } @@ -167,7 +167,7 @@ class npc_doomfire_targetting : public CreatureScript public: npc_doomfire_targetting() : CreatureScript("npc_doomfire_targetting") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_doomfire_targettingAI(creature); } @@ -179,13 +179,13 @@ public: uint64 TargetGUID; uint32 ChangeTargetTimer; - void Reset() OVERRIDE + void Reset() override { TargetGUID = 0; ChangeTargetTimer = 5000; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { //will update once TargetGUID is 0. In case noone actually moves(not likely) and this is 0 @@ -194,14 +194,14 @@ public: TargetGUID = who->GetGUID(); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { damage = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (ChangeTargetTimer <= diff) { @@ -235,7 +235,7 @@ class boss_archimonde : public CreatureScript public: boss_archimonde() : CreatureScript("boss_archimonde") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_archimondeAI>(creature); } @@ -271,7 +271,7 @@ public: bool HasProtected; bool IsChanneling; - void Reset() OVERRIDE + void Reset() override { instance->SetData(DATA_ARCHIMONDEEVENT, NOT_STARTED); @@ -299,7 +299,7 @@ public: IsChanneling = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { me->InterruptSpell(CURRENT_CHANNELED_SPELL); Talk(SAY_AGGRO); @@ -308,7 +308,7 @@ public: instance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { Talk(SAY_SLAY); @@ -341,7 +341,7 @@ public: ++SoulChargeCount; } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { hyjal_trashAI::JustDied(killer); Talk(SAY_DEATH); @@ -385,7 +385,7 @@ public: return false; } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == CREATURE_ANCIENT_WISP) summoned->AI()->AttackStart(me); @@ -462,7 +462,7 @@ public: SoulChargeTimer = urand(2000, 30000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) { @@ -630,7 +630,7 @@ public: DoMeleeAttackIfReady(); } - void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } + void WaypointReached(uint32 /*waypointId*/) override { } }; }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 16002b59f1a..d7c48541315 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -46,7 +46,7 @@ class boss_azgalor : public CreatureScript public: boss_azgalor() : CreatureScript("boss_azgalor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_azgalorAI>(creature); } @@ -68,7 +68,7 @@ public: bool go; - void Reset() OVERRIDE + void Reset() override { damageTaken = 0; RainTimer = 20000; @@ -82,7 +82,7 @@ public: instance->SetData(DATA_AZGALOREVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); @@ -90,12 +90,12 @@ public: Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance) { @@ -105,7 +105,7 @@ public: } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { hyjal_trashAI::JustDied(killer); if (IsEvent) @@ -113,7 +113,7 @@ public: Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsEvent) { @@ -182,7 +182,7 @@ class npc_lesser_doomguard : public CreatureScript public: npc_lesser_doomguard() : CreatureScript("npc_lesser_doomguard") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_lesser_doomguardAI>(creature); } @@ -204,7 +204,7 @@ public: uint64 AzgalorGUID; InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { CrippleTimer = 50000; WarstompTimer = 10000; @@ -212,30 +212,30 @@ public: CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { } - void WaypointReached(uint32 /*waypointId*/) OVERRIDE + void WaypointReached(uint32 /*waypointId*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who)) AttackStart(who); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CheckTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 6a9f34d4fc2..235b27dfb10 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -47,7 +47,7 @@ class boss_kazrogal : public CreatureScript public: boss_kazrogal() : CreatureScript("boss_kazrogal") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_kazrogalAI>(creature); } @@ -66,7 +66,7 @@ public: uint32 MarkTimerBase; bool go; - void Reset() OVERRIDE + void Reset() override { damageTaken = 0; CleaveTimer = 5000; @@ -78,19 +78,19 @@ public: instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance) { @@ -100,7 +100,7 @@ public: } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { hyjal_trashAI::JustDied(killer); if (IsEvent) @@ -108,7 +108,7 @@ public: DoPlaySoundToSet(me, SOUND_ONDEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsEvent) { @@ -188,7 +188,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader targets.remove_if(MarkTargetFilter()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mark_of_kazrogal_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } @@ -198,7 +198,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader { PrepareAuraScript(spell_mark_of_kazrogal_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MARK_DAMAGE)) return false; @@ -217,18 +217,18 @@ class spell_mark_of_kazrogal : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazrogal_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mark_of_kazrogal_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mark_of_kazrogal_AuraScript(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 691207a4682..21fe3ab946b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -42,7 +42,7 @@ class boss_rage_winterchill : public CreatureScript public: boss_rage_winterchill() : CreatureScript("boss_rage_winterchill") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_rage_winterchillAI>(creature); } @@ -61,7 +61,7 @@ public: uint32 IceboltTimer; bool go; - void Reset() OVERRIDE + void Reset() override { damageTaken = 0; FrostArmorTimer = 37000; @@ -73,19 +73,19 @@ public: instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance) { @@ -95,7 +95,7 @@ public: } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { hyjal_trashAI::JustDied(killer); if (IsEvent) @@ -103,7 +103,7 @@ public: Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsEvent) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 4419973902a..ede038863fc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -53,7 +53,7 @@ class npc_jaina_proudmoore : public CreatureScript public: npc_jaina_proudmoore() : CreatureScript("npc_jaina_proudmoore") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); @@ -78,7 +78,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); if (ai->EventBegun) @@ -100,7 +100,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { if (!creature->GetInstanceScript()) return NULL; @@ -132,7 +132,7 @@ class npc_thrall : public CreatureScript public: npc_thrall() : CreatureScript("npc_thrall") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); @@ -158,7 +158,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); if (ai->EventBegun) @@ -185,7 +185,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { if (!creature->GetInstanceScript()) return NULL; @@ -213,7 +213,7 @@ class npc_tyrande_whisperwind : public CreatureScript public: npc_tyrande_whisperwind() : CreatureScript("npc_tyrande_whisperwind") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { if (!creature->GetInstanceScript()) return NULL; @@ -224,7 +224,7 @@ public: return ai; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -240,7 +240,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index bfe4db137f3..038b7ab69ce 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -432,16 +432,16 @@ public: uint32 FlameBuffetTimer; bool imol; - void Reset() OVERRIDE + void Reset() override { spawnTimer = 2000; FlameBuffetTimer= 2000; imol = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 0 && !IsOverrun) { @@ -454,7 +454,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Delay <= diff) { @@ -525,7 +525,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_giant_infernalAI>(creature); } @@ -536,7 +536,7 @@ class npc_abomination : public CreatureScript public: npc_abomination() : CreatureScript("npc_abomination") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_abominationAI>(creature); } @@ -552,12 +552,12 @@ public: bool go; uint32 KnockDownTimer; - void Reset() OVERRIDE + void Reset() override { KnockDownTimer = 10000; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && !IsOverrun) { @@ -584,9 +584,9 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -631,7 +631,7 @@ class npc_ghoul : public CreatureScript public: npc_ghoul() : CreatureScript("npc_ghoul") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_ghoulAI>(creature); } @@ -649,14 +649,14 @@ public: uint32 FrenzyTimer; uint32 MoveTimer; bool RandomMove; - void Reset() OVERRIDE + void Reset() override { FrenzyTimer = 5000+rand()%5000; MoveTimer = 2000; RandomMove = false; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && !IsOverrun) { @@ -684,9 +684,9 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -730,7 +730,7 @@ class npc_necromancer : public CreatureScript public: npc_necromancer() : CreatureScript("npc_necromancer") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_necromancerAI>(creature); } @@ -748,13 +748,13 @@ public: bool go; uint32 ShadowBoltTimer; - void Reset() OVERRIDE + void Reset() override { ShadowBoltTimer = 1000+rand()%5000; summons.DespawnAll(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); if (target) @@ -762,12 +762,12 @@ public: summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { summons.Despawn(summon); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && !IsOverrun) { @@ -786,7 +786,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { switch (urand(0, 2)) { @@ -804,9 +804,9 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); @@ -854,7 +854,7 @@ class npc_banshee : public CreatureScript public: npc_banshee() : CreatureScript("npc_banshee") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_bansheeAI>(creature); } @@ -873,14 +873,14 @@ public: uint32 WailTimer; uint32 ShellTimer; - void Reset() OVERRIDE + void Reset() override { CourseTimer = 20000+rand()%5000; WailTimer = 15000+rand()%5000; ShellTimer = 50000+rand()%10000; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && !IsOverrun) { @@ -899,9 +899,9 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -954,7 +954,7 @@ class npc_crypt_fiend : public CreatureScript public: npc_crypt_fiend() : CreatureScript("npc_crypt_fiend") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_crypt_fiendAI>(creature); } @@ -971,12 +971,12 @@ public: bool go; uint32 WebTimer; - void Reset() OVERRIDE + void Reset() override { WebTimer = 20000+rand()%5000; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && !IsOverrun) { @@ -995,9 +995,9 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1040,7 +1040,7 @@ class npc_fel_stalker : public CreatureScript public: npc_fel_stalker() : CreatureScript("npc_fel_stalker") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_fel_stalkerAI>(creature); } @@ -1057,12 +1057,12 @@ public: bool go; uint32 ManaBurnTimer; - void Reset() OVERRIDE + void Reset() override { ManaBurnTimer = 9000+rand()%5000; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && !IsOverrun) { @@ -1081,9 +1081,9 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1126,7 +1126,7 @@ class npc_frost_wyrm : public CreatureScript public: npc_frost_wyrm() : CreatureScript("npc_frost_wyrm") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_frost_wyrmAI>(creature); } @@ -1144,14 +1144,14 @@ public: uint32 FrostBreathTimer; uint32 MoveTimer; - void Reset() OVERRIDE + void Reset() override { FrostBreathTimer = 5000; MoveTimer = 0; me->SetDisableGravity(true); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 2 && !IsOverrun) { @@ -1164,7 +1164,7 @@ public: } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (IsEvent) instance->SetData(DATA_TRASH, 0);//signal trash is dead @@ -1176,9 +1176,9 @@ public: me->SetPosition(x, y, z, 0); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); @@ -1241,7 +1241,7 @@ class npc_gargoyle : public CreatureScript public: npc_gargoyle() : CreatureScript("npc_gargoyle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_gargoyleAI>(creature); } @@ -1263,7 +1263,7 @@ public: float Zpos; bool forcemove; - void Reset() OVERRIDE + void Reset() override { forcemove = true; Zpos = 10.0f; @@ -1272,7 +1272,7 @@ public: me->SetDisableGravity(true); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 2 && !IsOverrun) { @@ -1285,7 +1285,7 @@ public: } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { float x, y, z; me->GetPosition(x, y, z); @@ -1295,7 +1295,7 @@ public: hyjal_trashAI::JustDied(killer); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); @@ -1379,7 +1379,7 @@ class alliance_rifleman : public CreatureScript public: alliance_rifleman() : CreatureScript("alliance_rifleman") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new alliance_riflemanAI(creature); } @@ -1393,16 +1393,16 @@ public: uint32 ExplodeTimer; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { } - void Reset() OVERRIDE + void Reset() override { ExplodeTimer = 5000+rand()%5000; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || me->GetVictim()) @@ -1416,11 +1416,11 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 52a5f0bc0ed..b0a1856f45f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -49,7 +49,7 @@ class instance_hyjal : public InstanceMapScript public: instance_hyjal() : InstanceMapScript("instance_hyjal", 534) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_mount_hyjal_InstanceMapScript(map); } @@ -58,7 +58,7 @@ public: { instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map) { } - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -82,7 +82,7 @@ public: ArchiYell = false; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < EncounterCount; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -91,7 +91,7 @@ public: return false; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -115,7 +115,7 @@ public: } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -130,7 +130,7 @@ public: } } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -147,7 +147,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -268,7 +268,7 @@ public: } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -285,12 +285,12 @@ public: return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { return str_data; } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp index a03bfb3082b..44e1067498d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp @@ -50,7 +50,7 @@ class boss_epoch : public CreatureScript public: boss_epoch() : CreatureScript("boss_epoch") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_epochAI>(creature); } @@ -72,7 +72,7 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiStep = 1; uiStepTimer = 26000; @@ -84,14 +84,14 @@ public: instance->SetData(DATA_EPOCH_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -126,14 +126,14 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetData(DATA_EPOCH_EVENT, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp index c3427c99fbb..f3333c0b0b6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp @@ -37,7 +37,7 @@ class boss_infinite_corruptor : public CreatureScript public: boss_infinite_corruptor() : CreatureScript("boss_infinite_corruptor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_infinite_corruptorAI>(creature); } @@ -51,18 +51,18 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { instance->SetData(DATA_INFINITE_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { //Return since we have no target if (!UpdateVictim()) @@ -71,7 +71,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetData(DATA_INFINITE_EVENT, DONE); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 7c0169cda95..6d36a933687 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -64,7 +64,7 @@ class boss_mal_ganis : public CreatureScript public: boss_mal_ganis() : CreatureScript("boss_mal_ganis") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_mal_ganisAI>(creature); } @@ -91,7 +91,7 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { bYelled = false; bYelled2 = false; @@ -105,19 +105,19 @@ public: instance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (damage >= me->GetHealth() && done_by != me) damage = me->GetHealth()-1; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { switch (Phase) { @@ -223,7 +223,7 @@ public: } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetData(DATA_MAL_GANIS_EVENT, DONE); DoCastAOE(SPELL_MAL_GANIS_KILL_CREDIT); @@ -231,7 +231,7 @@ public: DoCastAOE(SPELL_KILL_CREDIT); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index b4bf6a30140..4c26b30947f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -49,7 +49,7 @@ class boss_meathook : public CreatureScript public: boss_meathook() : CreatureScript("boss_meathook") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_meathookAI>(creature); } @@ -68,7 +68,7 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiChainTimer = urand(12000, 17000); //seen on video 13, 17, 15, 12, 16 uiDiseaseTimer = urand(2000, 4000); //approx 3s @@ -77,14 +77,14 @@ public: instance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -112,14 +112,14 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetData(DATA_MEATHOOK_EVENT, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index 5d9477a1b45..7c299b1feaa 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -54,7 +54,7 @@ class boss_salramm : public CreatureScript public: boss_salramm() : CreatureScript("boss_salramm") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_salrammAI>(creature); } @@ -75,7 +75,7 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiCurseFleshTimer = 30000; //30s DBM uiExplodeGhoulTimer = urand(25000, 28000); //approx 6 sec after summon ghouls @@ -86,14 +86,14 @@ public: instance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -135,14 +135,14 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetData(DATA_SALRAMM_EVENT, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 9316aaa7cd8..0e6d60395d8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -255,7 +255,7 @@ class npc_arthas : public CreatureScript public: npc_arthas() : CreatureScript("npc_arthas") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); npc_arthasAI* ai = CAST_AI(npc_arthas::npc_arthasAI, creature->AI()); @@ -298,7 +298,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { npc_arthasAI* ai = CAST_AI(npc_arthas::npc_arthasAI, creature->AI()); @@ -342,7 +342,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_arthasAI>(creature); } @@ -379,7 +379,7 @@ public: uint32 exorcismTimer; - void Reset() OVERRIDE + void Reset() override { utherGUID = 0; jainaGUID = 0; @@ -415,12 +415,12 @@ public: wave = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_ARTHAS_AURA); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetData(DATA_ARTHAS_EVENT, FAIL); } @@ -467,7 +467,7 @@ public: ++step; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -585,7 +585,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -1222,7 +1222,7 @@ class npc_crate_helper : public CreatureScript _marked = false; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_ARCANE_DISRUPTION && !_marked) { @@ -1241,7 +1241,7 @@ class npc_crate_helper : public CreatureScript bool _marked; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_crate_helperAI(creature); } 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 9e192d2e1a2..dbd844aa34c 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 @@ -45,7 +45,7 @@ class instance_culling_of_stratholme : public InstanceMapScript public: instance_culling_of_stratholme() : InstanceMapScript("instance_culling_of_stratholme", 595) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_culling_of_stratholme_InstanceMapScript(map); } @@ -70,7 +70,7 @@ class instance_culling_of_stratholme : public InstanceMapScript _crateCount = 0; } - bool IsEncounterInProgress() const OVERRIDE + 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) OVERRIDE + 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) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -116,7 +116,7 @@ class instance_culling_of_stratholme : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -143,7 +143,7 @@ class instance_culling_of_stratholme : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -197,7 +197,7 @@ class instance_culling_of_stratholme : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -217,7 +217,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -247,7 +247,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -259,7 +259,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return saveStream.str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index 5b1db051a56..b63075b681a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -52,7 +52,7 @@ class boss_captain_skarloc : public CreatureScript public: boss_captain_skarloc() : CreatureScript("boss_captain_skarloc") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_captain_skarlocAI>(creature); } @@ -73,7 +73,7 @@ public: uint32 DevotionAura_Timer; uint32 Consecration_Timer; - void Reset() OVERRIDE + void Reset() override { Holy_Light_Timer = urand(20000, 30000); Cleanse_Timer = 10000; @@ -83,19 +83,19 @@ public: Consecration_Timer = 8000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { //This is not correct. Should taunt Thrall before engage in combat Talk(SAY_TAUNT1); Talk(SAY_TAUNT2); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -103,7 +103,7 @@ public: instance->SetData(TYPE_THRALL_PART1, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 4d75bc0545c..4192feb52a7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -50,7 +50,7 @@ class boss_epoch_hunter : public CreatureScript public: boss_epoch_hunter() : CreatureScript("boss_epoch_hunter") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_epoch_hunterAI>(creature); } @@ -69,7 +69,7 @@ public: uint32 WingBuffet_Timer; uint32 Mda_Timer; - void Reset() OVERRIDE + void Reset() override { SandBreath_Timer = urand(8000, 16000); ImpendingDeath_Timer = urand(25000, 30000); @@ -77,17 +77,17 @@ public: Mda_Timer = 40000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -95,7 +95,7 @@ public: instance->SetData(TYPE_THRALL_PART4, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 7ca850e8754..a6f1cdd5b0b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -37,7 +37,7 @@ class go_barrel_old_hillsbrad : public GameObjectScript public: go_barrel_old_hillsbrad() : GameObjectScript("go_barrel_old_hillsbrad") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { if (InstanceScript* instance = go->GetInstanceScript()) { @@ -107,7 +107,7 @@ class boss_lieutenant_drake : public CreatureScript public: boss_lieutenant_drake() : CreatureScript("boss_lieutenant_drake") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lieutenant_drakeAI(creature); } @@ -124,7 +124,7 @@ public: uint32 MortalStrike_Timer; uint32 ExplodingShout_Timer; - void Reset() OVERRIDE + void Reset() override { CanPatrol = true; wpId = 0; @@ -135,22 +135,22 @@ public: ExplodingShout_Timer = 25000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { /// @todo make this work if (CanPatrol && wpId == 0) 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 47317b0a13e..6fc36663c2a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -45,7 +45,7 @@ class instance_old_hillsbrad : public InstanceMapScript public: instance_old_hillsbrad() : InstanceMapScript("instance_old_hillsbrad", 560) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_old_hillsbrad_InstanceMapScript(map); } @@ -62,7 +62,7 @@ public: uint64 TarethaGUID; uint64 EpochGUID; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -104,7 +104,7 @@ public: } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -120,7 +120,7 @@ public: } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { Player* player = GetPlayerInMap(); @@ -203,7 +203,7 @@ public: } } - uint32 GetData(uint32 data) const OVERRIDE + uint32 GetData(uint32 data) const override { switch (data) { @@ -223,7 +223,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index bf902ba403c..f6ff1719391 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -56,7 +56,7 @@ class npc_erozion : public CreatureScript public: npc_erozion() : CreatureScript("npc_erozion") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -76,7 +76,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -185,12 +185,12 @@ class npc_thrall_old_hillsbrad : public CreatureScript public: npc_thrall_old_hillsbrad() : CreatureScript("npc_thrall_old_hillsbrad") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_thrall_old_hillsbradAI>(creature); } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); InstanceScript* instance = creature->GetInstanceScript(); @@ -240,7 +240,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) { @@ -288,7 +288,7 @@ public: bool LowHp; bool HadMount; - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -454,7 +454,7 @@ public: } } - void Reset() OVERRIDE + void Reset() override { LowHp = false; @@ -489,7 +489,7 @@ public: me->Dismount(); me->SetSpeed(MOVE_RUN, SPEED_RUN); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_TH_RANDOM_AGGRO); if (me->IsMounted()) @@ -499,7 +499,7 @@ public: } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { switch (summoned->GetEntry()) { @@ -516,11 +516,11 @@ public: } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_TH_RANDOM_KILL); } - void JustDied(Unit* slayer) OVERRIDE + void JustDied(Unit* slayer) override { instance->SetData(TYPE_THRALL_EVENT, FAIL); @@ -531,7 +531,7 @@ public: Talk(SAY_TH_RANDOM_DIE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -566,12 +566,12 @@ class npc_taretha : public CreatureScript public: npc_taretha() : CreatureScript("npc_taretha") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_tarethaAI>(creature); } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); InstanceScript* instance = creature->GetInstanceScript(); @@ -597,7 +597,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { InstanceScript* instance = creature->GetInstanceScript(); if (instance->GetData(TYPE_THRALL_PART3) == DONE && instance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) @@ -617,7 +617,7 @@ public: InstanceScript* instance; - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -630,10 +630,10 @@ public: } } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index bf11d781a0c..4a2b3d650d6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -59,9 +59,9 @@ public: { boss_aeonusAI(Creature* creature) : BossAI(creature, TYPE_AEONUS) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 30000)); events.ScheduleEvent(EVENT_TIMESTOP, urand(10000, 15000)); @@ -70,7 +70,7 @@ public: Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { //Despawn Time Keeper @@ -86,7 +86,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -94,13 +94,13 @@ public: instance->SetData(TYPE_MEDIVH, DONE); // FIXME: later should be removed } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -136,7 +136,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_aeonusAI>(creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index 251c1b14e9b..4c69efa6ca7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -60,9 +60,9 @@ public: { boss_chrono_lord_dejaAI(Creature* creature) : BossAI(creature, TYPE_CRONO_LORD_DEJA) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(18000, 23000)); events.ScheduleEvent(EVENT_TIME_LAPSE, urand(10000, 15000)); @@ -73,7 +73,7 @@ public: Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { //Despawn Time Keeper @@ -89,19 +89,19 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetData(TYPE_RIFT, SPECIAL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -142,7 +142,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_chrono_lord_dejaAI>(creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index fcd3cc92604..e83c290e010 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -59,9 +59,9 @@ public: { boss_temporusAI(Creature* creature) : BossAI(creature, TYPE_TEMPORUS) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_HASTE, urand(15000, 23000)); events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000); @@ -72,19 +72,19 @@ public: Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetData(TYPE_RIFT, SPECIAL); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { //Despawn Time Keeper @@ -101,7 +101,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -140,7 +140,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_temporusAI>(creature); } 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 2246ec13726..cf3eff4732c 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 @@ -73,7 +73,7 @@ class instance_the_black_morass : public InstanceMapScript public: instance_the_black_morass() : InstanceMapScript("instance_the_black_morass", 269) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_the_black_morass_InstanceMapScript(map); } @@ -92,7 +92,7 @@ public: uint64 _medivhGUID; uint8 _currentRiftId; - void Initialize() OVERRIDE + void Initialize() override { _medivhGUID = 0; Clear(); @@ -117,7 +117,7 @@ public: DoUpdateWorldState(WORLD_STATE_BM_RIFT, 0); } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { if (GetData(TYPE_MEDIVH) == IN_PROGRESS) return true; @@ -125,7 +125,7 @@ public: return false; } - void OnPlayerEnter(Player* player) OVERRIDE + 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) OVERRIDE + void OnCreatureCreate(Creature* creature) override { if (creature->GetEntry() == NPC_MEDIVH) _medivhGUID = creature->GetGUID(); @@ -165,7 +165,7 @@ public: } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -236,7 +236,7 @@ public: } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -252,7 +252,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { if (data == DATA_MEDIVH) return _medivhGUID; @@ -316,7 +316,7 @@ public: } } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (m_auiEncounter[1] != IN_PROGRESS) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 48401674442..a1c4f057161 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -68,7 +68,7 @@ class npc_medivh_bm : public CreatureScript public: npc_medivh_bm() : CreatureScript("npc_medivh_bm") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_medivh_bmAI>(creature); } @@ -89,7 +89,7 @@ public: bool Life50; bool Life25; - void Reset() OVERRIDE + void Reset() override { SpellCorrupt_Timer = 0; Check_Timer = 0; @@ -105,7 +105,7 @@ public: DoCast(me, SPELL_PORTAL_RUNE, true); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 10.0f)) { @@ -136,7 +136,7 @@ public: } } - void AttackStart(Unit* /*who*/) OVERRIDE + void AttackStart(Unit* /*who*/) override { //if (instance->GetData(TYPE_MEDIVH) == IN_PROGRESS) // return; @@ -144,9 +144,9 @@ public: //ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (SpellCorrupt_Timer) return; @@ -158,7 +158,7 @@ public: SpellCorrupt_Timer = 3000; } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (killer->GetEntry() == me->GetEntry()) return; @@ -166,7 +166,7 @@ public: Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (SpellCorrupt_Timer) { @@ -256,7 +256,7 @@ class npc_time_rift : public CreatureScript public: npc_time_rift() : CreatureScript("npc_time_rift") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_time_riftAI>(creature); } @@ -275,7 +275,7 @@ public: uint8 mPortalCount; uint8 mWaveId; - void Reset() OVERRIDE + void Reset() override { TimeRiftWave_Timer = 15000; @@ -290,7 +290,7 @@ public: else mWaveId = 1; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void DoSummonAtRift(uint32 creature_entry) { @@ -333,7 +333,7 @@ public: } else DoSummonAtRift(entry); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (TimeRiftWave_Timer <= diff) { @@ -367,7 +367,7 @@ class npc_saat : public CreatureScript public: npc_saat() : CreatureScript("npc_saat") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -378,7 +378,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index 160495a8dc2..ff4c0e7578b 100644 --- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -30,7 +30,7 @@ class instance_dire_maul : public InstanceMapScript public: instance_dire_maul() : InstanceMapScript("instance_dire_maul", 429) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_dire_maul_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp index 02f4d34c1de..100d14b756b 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp @@ -188,12 +188,12 @@ class npc_harbinger_of_flame : public CreatureScript _events.ScheduleEvent(EVENT_FIEROCLAST_BARRAGE, 6000); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { AlysrazorTrashEvaded(me); } - void MoveInLineOfSight(Unit* unit) OVERRIDE + void MoveInLineOfSight(Unit* unit) override { if (me->IsInCombat()) return; @@ -204,7 +204,7 @@ class npc_harbinger_of_flame : public CreatureScript ScriptedAI::MoveInLineOfSight(unit); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) if (!me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) @@ -242,7 +242,7 @@ class npc_harbinger_of_flame : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_harbinger_of_flameAI(creature); } @@ -259,20 +259,20 @@ class npc_blazing_monstrosity : public CreatureScript { } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { _summons.DespawnAll(); _events.Reset(); PassiveAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _summons.DespawnAll(); _events.Reset(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { AlysrazorTrashEvaded(me); } @@ -287,7 +287,7 @@ class npc_blazing_monstrosity : public CreatureScript _events.ScheduleEvent(EVENT_CONTINUE_SPITTING, 9000); } - void PassengerBoarded(Unit* passenger, int8 /*seat*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* passenger, int8 /*seat*/, bool apply) override { if (!apply) return; @@ -305,17 +305,17 @@ class npc_blazing_monstrosity : public CreatureScript init.Launch(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { _summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { _summons.Despawn(summon); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -344,7 +344,7 @@ class npc_blazing_monstrosity : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_blazing_monstrosityAI(creature); } @@ -361,20 +361,20 @@ class npc_molten_barrage : public CreatureScript { } - void AttackStart(Unit* target) OVERRIDE + void AttackStart(Unit* target) override { if (target) me->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f, MOTION_SLOT_IDLE); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { DoCastAOE(SPELL_AGGRO_CLOSEST, true); DoCast(me, SPELL_MOLTEN_BARRAGE_VISUAL); DoCast(me, SPELL_INVISIBILITY_AND_STEALTH_DETECTION, true); } - void MovementInform(uint32 movementType, uint32 /*pointId*/) OVERRIDE + void MovementInform(uint32 movementType, uint32 /*pointId*/) override { if (movementType != EFFECT_MOTION_TYPE) return; @@ -384,7 +384,7 @@ class npc_molten_barrage : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_molten_barrageAI(creature); } @@ -401,16 +401,16 @@ class npc_egg_pile : public CreatureScript { } - void AttackStart(Unit* /*target*/) OVERRIDE { } + void AttackStart(Unit* /*target*/) override { } - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_PASSIVE); _events.Reset(); _callHatchlingSpell = 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _events.Reset(); std::list<Creature*> eggs; @@ -421,12 +421,12 @@ class npc_egg_pile : public CreatureScript DoCast(me, SPELL_ALYSRAZOR_COSMETIC_EGG_XPLOSION, true); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { AlysrazorTrashEvaded(me); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action != NPC_BLAZING_MONSTROSITY_LEFT && action != NPC_BLAZING_MONSTROSITY_RIGHT) @@ -441,7 +441,7 @@ class npc_egg_pile : public CreatureScript _events.ScheduleEvent(EVENT_SUMMON_SMOULDERING_HATCHLING, 1); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -487,7 +487,7 @@ class npc_egg_pile : public CreatureScript uint32 _callHatchlingSpell; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_egg_pileAI(creature); } @@ -502,7 +502,7 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_cosmetic_egg_xplosion_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sCreatureDisplayInfoStore.LookupEntry(MODEL_INVISIBLE_STALKER)) return false; @@ -517,13 +517,13 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader creature->DespawnOrUnsummon(4000); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_alysrazor_cosmetic_egg_xplosion_SpellScript::HandleExplosion, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_alysrazor_cosmetic_egg_xplosion_SpellScript(); } @@ -538,7 +538,7 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_turn_monstrosity_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GENERIC_DUMMY_CAST)) return false; @@ -605,14 +605,14 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader GetHitUnit()->PlayOneShotAnimKit(ANIM_KIT_BIRD_TURN); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_alysrazor_turn_monstrosity_SpellScript::KnockBarrage, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_alysrazor_turn_monstrosity_SpellScript::TurnBird, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_alysrazor_turn_monstrosity_SpellScript(); } @@ -627,7 +627,7 @@ class spell_alysrazor_aggro_closest : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_aggro_closest_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -645,14 +645,14 @@ class spell_alysrazor_aggro_closest : public SpellScriptLoader GetCaster()->GetAI()->AttackStart(GetCaster()->ToCreature()->SelectVictim()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_alysrazor_aggro_closest_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); AfterCast += SpellCastFn(spell_alysrazor_aggro_closest_SpellScript::UpdateThreat); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_alysrazor_aggro_closest_SpellScript(); } @@ -667,7 +667,7 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_fieroblast_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FIRE_IT_UP)) return false; @@ -679,13 +679,13 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_FIRE_IT_UP, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { AfterCast += SpellCastFn(spell_alysrazor_fieroblast_SpellScript::FireItUp); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_alysrazor_fieroblast_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp index 9ad179e9795..f53a749c777 100644 --- a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp @@ -30,12 +30,12 @@ class instance_firelands : public InstanceMapScript { } - void Initialize() OVERRIDE + void Initialize() override { SetBossNumber(EncounterCount); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -47,7 +47,7 @@ class instance_firelands : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_firelands_InstanceScript(map); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp index e9ddc6ffeff..c8963331702 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp @@ -141,7 +141,7 @@ public: events.ScheduleEvent(EVENT_ANRAPHET_OMEGA_STANCE, 35000, 0, PHASE_COMBAT); } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetWalk(false); @@ -156,14 +156,14 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(ANRAPHET_SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); Talk(ANRAPHET_SAY_DEATH); @@ -174,26 +174,26 @@ public: _JustDied(); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(ANRAPHET_SAY_KILL); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _JustReachedHome(); instance->SetBossState(DATA_ANRAPHET, FAIL); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_ANRAPHET_INTRO) events.ScheduleEvent(EVENT_ANRAPHET_APPEAR, 6000, 0, PHASE_INTRO); } - void MovementInform(uint32 type, uint32 point) OVERRIDE + void MovementInform(uint32 type, uint32 point) override { if (type != POINT_MOTION_TYPE) return; @@ -205,7 +205,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if ((events.GetPhaseMask() & PHASE_MASK_COMBAT) && (!UpdateVictim() || !CheckInRoom())) return; @@ -264,7 +264,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfOriginationAI<boss_anraphetAI>(creature); } @@ -279,15 +279,15 @@ class npc_omega_stance : public CreatureScript { npc_omega_stanceAI(Creature* creature) : ScriptedAI(creature) { } - void IsSummonedBy(Unit* /*who*/) OVERRIDE + void IsSummonedBy(Unit* /*who*/) override { DoCast(me, SPELL_OMEGA_STANCE_SPIDER_TRIGGER, true); } - void EnterEvadeMode() OVERRIDE { } + void EnterEvadeMode() override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_omega_stanceAI(creature); } @@ -302,19 +302,19 @@ class npc_alpha_beam : public CreatureScript { npc_alpha_beamAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* anraphet = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_ANRAPHET_GUID))) anraphet->CastSpell(me, SPELL_ALPHA_BEAMS_BACK_CAST); } - void EnterEvadeMode() OVERRIDE { } // Never evade + void EnterEvadeMode() override { } // Never evade private: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfOriginationAI<npc_alpha_beamAI>(creature); } @@ -329,7 +329,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript { npc_brann_bronzebeard_anraphetAI(Creature* creature) : CreatureAI(creature), _currentPoint(0), _instance(creature->GetInstanceScript()) { } - void sGossipSelect(Player* /*player*/, uint32 sender, uint32 action) OVERRIDE + void sGossipSelect(Player* /*player*/, uint32 sender, uint32 action) override { if (_instance->GetBossState(DATA_VAULT_OF_LIGHTS) == DONE) return; @@ -346,7 +346,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -369,7 +369,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -419,7 +419,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript } } - void MovementInform(uint32 movementType, uint32 pointId) OVERRIDE + void MovementInform(uint32 movementType, uint32 pointId) override { if (movementType != POINT_MOTION_TYPE) return; @@ -457,7 +457,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfOriginationAI<npc_brann_bronzebeard_anraphetAI>(creature); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index a547e9683a0..e444d6793e6 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -132,7 +132,7 @@ public: player->GetSession()->SendPacket(data); } - void Reset() OVERRIDE + void Reset() override { _summonDeaths = 0; _hasDispersed = false; @@ -144,7 +144,7 @@ public: events.ScheduleEvent(EVENT_EARTH_SPIKE, urand(16000, 21000), 0, PHASE_NORMAL); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (me->HealthBelowPctDamaged(50, damage) && (events.GetPhaseMask() & PHASE_MASK_NORMAL) && !_hasDispersed) { @@ -178,7 +178,7 @@ public: } } - void SetData(uint32 index, uint32 /*value*/) OVERRIDE + void SetData(uint32 index, uint32 /*value*/) override { if (index == DATA_SUMMON_DEATHS) { @@ -195,14 +195,14 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); Talk(SAY_DEATH); @@ -210,14 +210,14 @@ public: Cleanup(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _JustReachedHome(); instance->SetBossState(DATA_EARTHRAGER_PTAH, FAIL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -266,7 +266,7 @@ public: bool _hasDispersed; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfOriginationAI<boss_earthrager_ptahAI>(creature); } @@ -286,13 +286,13 @@ class spell_earthrager_ptah_flame_bolt : public SpellScriptLoader Trinity::Containers::RandomResizeList(targets, GetCaster()->GetMap()->IsHeroic() ? 3 : 2); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_earthrager_ptah_flame_bolt_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_earthrager_ptah_flame_bolt_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index a6127aa907f..7aed7a66a00 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -93,7 +93,7 @@ public: } } - void Reset() OVERRIDE + void Reset() override { _phase = PHASE_FIRST_SHIELD; _oldPhase = PHASE_FIRST_SHIELD; @@ -105,7 +105,7 @@ public: events.ScheduleEvent(EVENT_BURNING_LIGHT, 12000); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if ((me->HealthBelowPctDamaged(66, damage) && _phase == PHASE_FIRST_SHIELD) || (me->HealthBelowPctDamaged(33, damage) && _phase == PHASE_SECOND_SHIELD)) @@ -151,7 +151,7 @@ public: } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_DISABLE_BEACON) { @@ -165,34 +165,34 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); Talk(SAY_DEATH); _JustDied(); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _JustReachedHome(); instance->SetBossState(DATA_TEMPLE_GUARDIAN_ANHUUR, FAIL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom() || me->GetCurrentSpell(CURRENT_CHANNELED_SPELL) || _phase == PHASE_SHIELDED) return; @@ -257,7 +257,7 @@ public: uint8 _beacons; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfOriginationAI<boss_temple_guardian_anhuurAI>(creature); } @@ -289,13 +289,13 @@ class spell_anhuur_shield_of_light : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anhuur_shield_of_light_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_anhuur_shield_of_light_SpellScript(); } @@ -323,14 +323,14 @@ class spell_anhuur_disable_beacon_beams : public SpellScriptLoader anhuur->AI()->DoAction(ACTION_DISABLE_BEACON); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_anhuur_disable_beacon_beams_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHit += SpellEffectFn(spell_anhuur_disable_beacon_beams_SpellScript::Notify, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_anhuur_disable_beacon_beams_SpellScript(); } @@ -351,13 +351,13 @@ class spell_anhuur_activate_beacons : public SpellScriptLoader GetHitGObj()->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_anhuur_activate_beacons_SpellScript::Activate, EFFECT_0, SPELL_EFFECT_ACTIVATE_OBJECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_anhuur_activate_beacons_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp index 5a7b6489c94..a8c1c4f6108 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp @@ -67,7 +67,7 @@ class instance_halls_of_origination : public InstanceMapScript _deadElementals = 0; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -104,7 +104,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -125,7 +125,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -141,7 +141,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - uint32 GetData(uint32 data) const OVERRIDE + uint32 GetData(uint32 data) const override { switch (data) { @@ -154,7 +154,7 @@ class instance_halls_of_origination : public InstanceMapScript return 0; } - uint64 GetData64(uint32 index) const OVERRIDE + uint64 GetData64(uint32 index) const override { switch (index) { @@ -189,7 +189,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { Creature* creature = unit->ToCreature(); if (!creature) @@ -211,7 +211,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -222,7 +222,7 @@ class instance_halls_of_origination : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) OVERRIDE + void Load(const char* str) override { if (!str) { @@ -270,7 +270,7 @@ class instance_halls_of_origination : public InstanceMapScript uint32 _deadElementals; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_halls_of_origination_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index ec8596e4fc0..15330643bd3 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -38,7 +38,7 @@ class celebras_the_cursed : public CreatureScript public: celebras_the_cursed() : CreatureScript("celebras_the_cursed") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new celebras_the_cursedAI(creature); } @@ -51,21 +51,21 @@ public: uint32 EntanglingRootsTimer; uint32 CorruptForcesTimer; - void Reset() OVERRIDE + void Reset() override { WrathTimer = 8000; EntanglingRootsTimer = 2000; CorruptForcesTimer = 30000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->SummonCreature(13716, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 600000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp index 3b9ad0bfb79..12016d2223a 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp @@ -38,7 +38,7 @@ class boss_landslide : public CreatureScript public: boss_landslide() : CreatureScript("boss_landslide") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_landslideAI(creature); } @@ -51,18 +51,18 @@ public: uint32 TrampleTimer; uint32 LandslideTimer; - void Reset() OVERRIDE + void Reset() override { KnockAwayTimer = 8000; TrampleTimer = 2000; LandslideTimer = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 6b425c4c0fe..8c7197b2942 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -37,7 +37,7 @@ class boss_noxxion : public CreatureScript public: boss_noxxion() : CreatureScript("boss_noxxion") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_noxxionAI(creature); } @@ -52,7 +52,7 @@ public: uint32 InvisibleTimer; bool Invisible; - void Reset() OVERRIDE + void Reset() override { ToxicVolleyTimer = 7000; UppercutTimer = 16000; @@ -61,7 +61,7 @@ public: Invisible = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void SummonAdds(Unit* victim) { @@ -69,7 +69,7 @@ public: Add->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Invisible && InvisibleTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 035ababd3b9..0d48d8f43c6 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -40,7 +40,7 @@ class boss_princess_theradras : public CreatureScript public: boss_princess_theradras() : CreatureScript("boss_princess_theradras") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ptheradrasAI(creature); } @@ -54,7 +54,7 @@ public: uint32 ThrashTimer; uint32 RepulsiveGazeTimer; - void Reset() OVERRIDE + void Reset() override { DustfieldTimer = 8000; BoulderTimer = 2000; @@ -62,14 +62,14 @@ public: RepulsiveGazeTimer = 23000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->SummonCreature(12238, 28.067f, 61.875f, -123.405f, 4.67f, TEMPSUMMON_TIMED_DESPAWN, 600000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp index e5653df8f64..be71fdebe3e 100644 --- a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp @@ -30,7 +30,7 @@ class instance_maraudon : public InstanceMapScript public: instance_maraudon() : InstanceMapScript("instance_maraudon", 349) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_maraudon_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 29e08699a0f..f04b5634616 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -133,7 +133,7 @@ public: Reset(); } - void Reset() OVERRIDE + void Reset() override { if (!IsCombatMovementAllowed()) SetCombatMovement(true); @@ -150,7 +150,7 @@ public: instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); me->SetInCombatWithZone(); @@ -164,14 +164,14 @@ public: instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetBossState(DATA_ONYXIA, DONE); Summons.DespawnAll(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->SetInCombatWithZone(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -189,17 +189,17 @@ public: Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { Summons.Despawn(summon); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* Spell) OVERRIDE + void SpellHit(Unit* /*pCaster*/, const SpellInfo* Spell) override { if (Spell->Id == SPELL_BREATH_EAST_TO_WEST || Spell->Id == SPELL_BREATH_WEST_TO_EAST || @@ -216,7 +216,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE) { @@ -256,7 +256,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* Spell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* Spell) override { //Workaround - Couldn't find a way to group this spells (All Eruption) if (((Spell->Id >= 17086 && Spell->Id <= 17095) || @@ -301,7 +301,7 @@ public: MovePoint = iTemp; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -455,7 +455,7 @@ public: bool IsMoving; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_onyxiaAI>(creature); } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 9f04997dda7..e6a08ade87f 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -36,7 +36,7 @@ class instance_onyxias_lair : public InstanceMapScript public: instance_onyxias_lair() : InstanceMapScript("instance_onyxias_lair", 249) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_onyxias_lair_InstanceMapScript(map); } @@ -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() OVERRIDE + void Initialize() override { SetBossNumber(EncounterCount); @@ -61,7 +61,7 @@ public: achievSheDeepBreathMore = true; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -71,7 +71,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731) { @@ -92,7 +92,7 @@ public: } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731) { @@ -132,7 +132,7 @@ public: FloorEruptionGUID[1].erase(floorEruptedGUID); } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -147,7 +147,7 @@ public: return true; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -172,7 +172,7 @@ public: } } - void SetData64(uint32 type, uint64 data) OVERRIDE + void SetData64(uint32 type, uint64 data) override { switch (type) { @@ -184,7 +184,7 @@ public: } } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -195,7 +195,7 @@ public: return 0; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (GetBossState(DATA_ONYXIA) == IN_PROGRESS) { @@ -236,7 +236,7 @@ public: } } - bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscValue1 = 0*/) OVERRIDE + bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscValue1 = 0*/) override { switch (criteriaId) { @@ -250,7 +250,7 @@ public: return false; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -261,7 +261,7 @@ public: return saveStream.str(); } - void Load(const char* strIn) OVERRIDE + void Load(const char* strIn) override { if (!strIn) { diff --git a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp index 8d5173ff266..f5f63910b1a 100644 --- a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp +++ b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp @@ -30,7 +30,7 @@ class instance_ragefire_chasm : public InstanceMapScript public: instance_ragefire_chasm() : InstanceMapScript("instance_ragefire_chasm", 389) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_ragefire_chasm_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index bfc8c468af6..e0a30eba2c9 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -52,7 +52,7 @@ public: { boss_amnennar_the_coldbringerAI(Creature* creature) : BossAI(creature, DATA_AMNENNAR_THE_COLD_BRINGER) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); hp60Spectrals = false; @@ -60,7 +60,7 @@ public: hp50 = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_AMNENNARSWRATH, 8000); @@ -69,18 +69,18 @@ public: Talk(SAY_AGGRO); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -138,7 +138,7 @@ public: bool hp50; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_amnennar_the_coldbringerAI(creature); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp index 1e0d481249d..b1bce6ff38c 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp @@ -46,30 +46,30 @@ public: hp15 = false; } - void Reset() OVERRIDE + void Reset() override { _Reset(); hp50 = false; hp15 = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -95,7 +95,7 @@ public: bool hp15; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gluttonAI(creature); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp index 6026991f253..c2b94b7c7ae 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp @@ -52,13 +52,13 @@ public: { boss_mordresh_fire_eyeAI(Creature* creature) : BossAI(creature, DATA_MORDRESH_FIRE_EYE) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); events.ScheduleEvent(EVENT_OOC_1, 10000); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.Reset(); @@ -67,12 +67,12 @@ public: events.ScheduleEvent(EVENT_FIRE_NOVA, urand(8000, 12000)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -124,7 +124,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_mordresh_fire_eyeAI(creature); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp index 0c76da22625..8370d856524 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp @@ -42,7 +42,7 @@ public: { boss_tuten_kashAI(Creature* creature) : BossAI(creature, DATA_TUTEN_KASH) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); if (!me->HasAura(SPELL_THRASH)) @@ -51,19 +51,19 @@ public: DoCast(me, SPELL_VIRULENT_POISON); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_WEB_SPRAY, urand(3000, 5000)); events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, urand(9000, 14000)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -95,7 +95,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_tuten_kashAI(creature); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index a4ab03d6611..f7f4b035614 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -56,7 +56,7 @@ public: SetBossNumber(EncounterCount); } - void Initialize() OVERRIDE + void Initialize() override { goGongGUID = 0; gongWave = 0; @@ -67,7 +67,7 @@ public: summonCreature = 0; } - void OnGameObjectCreate(GameObject* gameObject) OVERRIDE + void OnGameObjectCreate(GameObject* gameObject) override { switch (gameObject->GetEntry()) { @@ -87,7 +87,7 @@ public: } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -108,7 +108,7 @@ public: return true; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type == DATA_WAVE) { @@ -172,7 +172,7 @@ public: } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -183,7 +183,7 @@ public: return saveStream.str(); } - void Load(const char* str) OVERRIDE + void Load(const char* str) override { if (!str) { @@ -225,7 +225,7 @@ public: uint32 summonCreature; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_razorfen_downs_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index f1d8e1b67e8..a8df690f726 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -64,7 +64,7 @@ public: { npc_henry_sternAI(Creature* creature) : ScriptedAI(creature) { } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) override { if (action == 0) { @@ -98,7 +98,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_henry_sternAI(creature); } @@ -163,7 +163,7 @@ public: spawnerCount = 0; } - void Reset() OVERRIDE + void Reset() override { if (!eventInProgress) { @@ -177,7 +177,7 @@ public: } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (channeling) Talk(SAY_WATCH_OUT, who); @@ -190,13 +190,13 @@ public: } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetBossState(DATA_EXTINGUISHING_THE_IDOL, DONE); me->DespawnOrUnsummon(5000); } - void sQuestAccept(Player* /*player*/, Quest const* quest) OVERRIDE + void sQuestAccept(Player* /*player*/, Quest const* quest) override { if (quest->GetQuestId() == QUEST_EXTINGUISHING_THE_IDOL) { @@ -208,7 +208,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == WAYPOINT_MOTION_TYPE && id == POINT_REACH_IDOL) { @@ -217,7 +217,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!eventInProgress) return; @@ -320,7 +320,7 @@ public: uint8 spawnerCount; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_belnistraszAI>(creature); } @@ -338,9 +338,9 @@ public: instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE { } + void Reset() override { } - void SetData(uint32 /*type*/, uint32 data) OVERRIDE + void SetData(uint32 /*type*/, uint32 data) override { if (data < 7) { @@ -358,7 +358,7 @@ public: InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_idol_room_spawnerAI>(creature); } @@ -384,7 +384,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { if (!me->HasAura(SPELL_POISON_PROC) && me->GetEntry() == NPC_TOMB_FIEND) DoCast(me, SPELL_POISON_PROC); @@ -393,17 +393,17 @@ public: DoCast(me, SPELL_VIRULENT_POISON_PROC); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetData(DATA_WAVE, me->GetEntry()); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_WEB, urand(5000, 8000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -428,7 +428,7 @@ public: EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_tomb_creatureAI>(creature); } @@ -443,7 +443,7 @@ class go_gong : public GameObjectScript public: go_gong() : GameObjectScript("go_gong") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 9900ba9e3b3..705b0231e82 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -35,7 +35,7 @@ class instance_razorfen_kraul : public InstanceMapScript public: instance_razorfen_kraul() : InstanceMapScript("instance_razorfen_kraul", 47) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_razorfen_kraul_InstanceMapScript(map); } @@ -47,7 +47,7 @@ public: uint64 DoorWardGUID; int WardKeeperDeath; - void Initialize() OVERRIDE + void Initialize() override { WardKeeperDeath = 0; DoorWardGUID = 0; @@ -69,7 +69,7 @@ public: return NULL; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -88,7 +88,7 @@ public: } } - void SetData(uint32 type, uint32 /*data*/) OVERRIDE + void SetData(uint32 type, uint32 /*data*/) override { switch (type) { diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index 1dc37e063ba..835fd6228e1 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -47,7 +47,7 @@ class npc_willix : public CreatureScript public: npc_willix() : CreatureScript("npc_willix") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER) { @@ -59,7 +59,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_willixAI(creature); } @@ -68,7 +68,7 @@ public: { npc_willixAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -118,19 +118,19 @@ public: } } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO1); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_WILLIX_THE_IMPORTER); @@ -164,7 +164,7 @@ struct npc_snufflenose_gopher : public CreatureScript public: npc_snufflenose_gopher() : CreatureScript("npc_snufflenose_gopher") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_snufflenose_gopherAI(creature); } @@ -177,13 +177,13 @@ public: TargetTubberGUID = 0; } - void Reset() OVERRIDE + void Reset() override { IsMovementActive = false; TargetTubberGUID = 0; } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == POINT_TUBBER) { @@ -232,13 +232,13 @@ public: IsMovementActive = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!IsMovementActive) PetAI::UpdateAI(diff); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_FIND_NEW_TUBBER) DoFindNewTubber(); @@ -259,7 +259,7 @@ class spell_snufflenose_command : public SpellScriptLoader { PrepareSpellScript(spell_snufflenose_commandSpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -271,13 +271,13 @@ class spell_snufflenose_command : public SpellScriptLoader target->ToCreature()->AI()->DoAction(ACTION_FIND_NEW_TUBBER); } - void Register() OVERRIDE + void Register() override { AfterCast += SpellCastFn(spell_snufflenose_commandSpellScript::HandleAfterCast); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_snufflenose_commandSpellScript(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index c2450d87739..162ce9b5359 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -82,7 +82,7 @@ class boss_ayamiss : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _phase = PHASE_AIR; @@ -90,7 +90,7 @@ class boss_ayamiss : public CreatureScript SetCombatMovement(false); } - void JustSummoned(Creature* who) OVERRIDE + void JustSummoned(Creature* who) override { switch (who->GetEntry()) { @@ -107,7 +107,7 @@ class boss_ayamiss : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE) { @@ -123,13 +123,13 @@ class boss_ayamiss : public CreatureScript } } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { me->ClearUnitState(UNIT_STATE_ROOT); BossAI::EnterEvadeMode(); } - void EnterCombat(Unit* attacker) OVERRIDE + void EnterCombat(Unit* attacker) override { BossAI::EnterCombat(attacker); @@ -144,7 +144,7 @@ class boss_ayamiss : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_AIR, AyamissAirPos); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -233,7 +233,7 @@ class boss_ayamiss : public CreatureScript bool _enraged; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_ayamissAI>(creature); } @@ -251,7 +251,7 @@ class npc_hive_zara_larva : public CreatureScript _instance = me->GetInstanceScript(); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE) if (id == POINT_PARALYZE) @@ -259,7 +259,7 @@ class npc_hive_zara_larva : public CreatureScript DoCast(target, SPELL_FEED); // Omnomnom } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) @@ -268,7 +268,7 @@ class npc_hive_zara_larva : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void AttackStart(Unit* victim) OVERRIDE + void AttackStart(Unit* victim) override { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) return; @@ -276,7 +276,7 @@ class npc_hive_zara_larva : public CreatureScript ScriptedAI::AttackStart(victim); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) return; @@ -287,7 +287,7 @@ class npc_hive_zara_larva : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_hive_zara_larvaAI>(creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index e62f1781f13..ac490b1440d 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -71,7 +71,7 @@ class boss_buru : public CreatureScript { } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { BossAI::EnterEvadeMode(); @@ -82,7 +82,7 @@ class boss_buru : public CreatureScript Eggs.clear(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { _EnterCombat(); Talk(EMOTE_TARGET, who); @@ -95,14 +95,14 @@ class boss_buru : public CreatureScript _phase = PHASE_EGG; } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_EXPLODE) if (_phase == PHASE_EGG) me->DealDamage(me, 45000); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TYPEID_PLAYER) ChaseNewVictim(); @@ -133,7 +133,7 @@ class boss_buru : public CreatureScript events.ScheduleEvent(EVENT_RESPAWN_EGG, 100000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -186,7 +186,7 @@ class boss_buru : public CreatureScript std::list<uint64> Eggs; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_buruAI(creature); } @@ -205,14 +205,14 @@ class npc_buru_egg : public CreatureScript SetCombatMovement(false); } - void EnterCombat(Unit* attacker) OVERRIDE + void EnterCombat(Unit* attacker) override { if (Creature* buru = me->GetMap()->GetCreature(_instance->GetData64(DATA_BURU))) if (!buru->IsInCombat()) buru->AI()->AttackStart(attacker); } - void JustSummoned(Creature* who) OVERRIDE + void JustSummoned(Creature* who) override { if (who->GetEntry() == NPC_HATCHLING) if (Creature* buru = me->GetMap()->GetCreature(_instance->GetData64(DATA_BURU))) @@ -220,7 +220,7 @@ class npc_buru_egg : public CreatureScript who->AI()->AttackStart(target); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCastAOE(SPELL_EXPLODE, true); DoCastAOE(SPELL_EXPLODE_2, true); // Unknown purpose @@ -234,7 +234,7 @@ class npc_buru_egg : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_buru_eggAI>(creature); } @@ -261,14 +261,14 @@ class spell_egg_explosion : public SpellScriptLoader GetCaster()->DealDamage(target, -16 * GetCaster()->GetDistance(target) + 500); } - void Register() OVERRIDE + void Register() override { AfterCast += SpellCastFn(spell_egg_explosion_SpellScript::HandleAfterCast); OnEffectHitTarget += SpellEffectFn(spell_egg_explosion_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_egg_explosion_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 84003576a2a..f0e582dee95 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -55,7 +55,7 @@ class boss_kurinnaxx : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _enraged = false; @@ -65,7 +65,7 @@ class boss_kurinnaxx : public CreatureScript events.ScheduleEvent(EVENT_WIDE_SLASH, 11000); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (!_enraged && HealthBelowPct(30)) { @@ -74,14 +74,14 @@ class boss_kurinnaxx : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); if (Creature* Ossirian = me->GetMap()->GetCreature(instance->GetData64(DATA_OSSIRIAN))) sCreatureTextMgr->SendChat(Ossirian, SAY_KURINAXX_DEATH, NULL, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -125,7 +125,7 @@ class boss_kurinnaxx : public CreatureScript bool _enraged; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_kurinnaxxAI>(creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 9dd82bf157e..e123a84f88e 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -62,7 +62,7 @@ class boss_moam : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetPower(POWER_MANA, 0); @@ -71,7 +71,7 @@ class boss_moam : public CreatureScript //events.ScheduleEvent(EVENT_WIDE_SLASH, 11000); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (!_isStonePhase && HealthBelowPct(45)) { @@ -80,7 +80,7 @@ class boss_moam : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -105,7 +105,7 @@ class boss_moam : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -175,7 +175,7 @@ class boss_moam : public CreatureScript bool _isStonePhase; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_moamAI(creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index d3744935f2e..256f76337b4 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -96,7 +96,7 @@ class boss_ossirian : public CreatureScript uint8 CrystalIterator; bool SaidIntro; - void Reset() OVERRIDE + void Reset() override { _Reset(); CrystalIterator = 0; @@ -104,7 +104,7 @@ class boss_ossirian : public CreatureScript CrystalGUID = 0; } - void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spell) override { for (uint8 i = 0; i < NUM_WEAKNESS; ++i) { @@ -117,7 +117,7 @@ class boss_ossirian : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_TRIGGER_WEAKNESS) if (Creature* Trigger = me->GetMap()->GetCreature(TriggerGUID)) @@ -125,7 +125,7 @@ class boss_ossirian : public CreatureScript Trigger->CastSpell(Trigger, SpellWeakness[urand(0, 4)], false); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.Reset(); @@ -154,19 +154,19 @@ class boss_ossirian : public CreatureScript SpawnNextCrystal(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { Cleanup(); summons.DespawnAll(); BossAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Cleanup(); _JustDied(); @@ -198,7 +198,7 @@ class boss_ossirian : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!SaidIntro) @@ -209,7 +209,7 @@ class boss_ossirian : public CreatureScript BossAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -267,7 +267,7 @@ class boss_ossirian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_ossirianAI>(creature); } @@ -278,7 +278,7 @@ class go_ossirian_crystal : public GameObjectScript public: go_ossirian_crystal() : GameObjectScript("go_ossirian_crystal") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { InstanceScript* Instance = player->GetInstanceScript(); if (!Instance) diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index b2aedfb5c99..0bb35f3842a 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -67,7 +67,7 @@ class boss_rajaxx : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); enraged = false; @@ -75,18 +75,18 @@ class boss_rajaxx : public CreatureScript events.ScheduleEvent(EVENT_THUNDERCRASH, 12000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { //SAY_DEATH _JustDied(); } - void EnterCombat(Unit* /*victim*/) OVERRIDE + void EnterCombat(Unit* /*victim*/) override { _EnterCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -119,7 +119,7 @@ class boss_rajaxx : public CreatureScript bool enraged; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_rajaxxAI(creature); } 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 761ca60f714..3da7e5b833f 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) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -72,13 +72,13 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript return true; } - void SetData64(uint32 type, uint64 data) OVERRIDE + void SetData64(uint32 type, uint64 data) override { if (type == DATA_PARALYZED) _paralyzedGUID = data; } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -101,7 +101,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -154,7 +154,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript uint64 _paralyzedGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_ruins_of_ahnqiraj_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 433193bd703..b904ed44b47 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -46,7 +46,7 @@ class boss_kri : public CreatureScript public: boss_kri() : CreatureScript("boss_kri") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_kriAI>(creature); } @@ -67,7 +67,7 @@ public: bool VemDead; bool Death; - void Reset() OVERRIDE + void Reset() override { Cleave_Timer = urand(4000, 8000); ToxicVolley_Timer = urand(6000, 12000); @@ -77,18 +77,18 @@ public: Death = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)// Unlootable if death me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); instance->SetData(DATA_BUG_TRIO_DEATH, 1); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -139,7 +139,7 @@ class boss_vem : public CreatureScript public: boss_vem() : CreatureScript("boss_vem") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_vemAI>(creature); } @@ -159,7 +159,7 @@ public: bool Enraged; - void Reset() OVERRIDE + void Reset() override { Charge_Timer = urand(15000, 27000); KnockBack_Timer = urand(8000, 20000); @@ -168,7 +168,7 @@ public: Enraged = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetData(DATA_VEM_DEATH, 0); if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)// Unlootable if death @@ -176,11 +176,11 @@ public: instance->SetData(DATA_BUG_TRIO_DEATH, 1); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -228,7 +228,7 @@ class boss_yauj : public CreatureScript public: boss_yauj() : CreatureScript("boss_yauj") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_yaujAI>(creature); } @@ -248,7 +248,7 @@ public: bool VemDead; - void Reset() OVERRIDE + void Reset() override { Heal_Timer = urand(25000, 40000); Fear_Timer = urand(12000, 24000); @@ -257,7 +257,7 @@ public: VemDead = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)// Unlootable if death me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); @@ -273,11 +273,11 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 988436066b6..ceedf0024ad 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -151,7 +151,7 @@ class boss_eye_of_cthun : public CreatureScript public: boss_eye_of_cthun() : CreatureScript("boss_eye_of_cthun") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<eye_of_cthunAI>(creature); } @@ -181,7 +181,7 @@ public: float DarkGlareAngle; bool ClockWise; - void Reset() OVERRIDE + void Reset() override { //Phase information PhaseTimer = 50000; //First dark glare in 50 seconds @@ -212,7 +212,7 @@ public: pPortal->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); instance->SetData(DATA_CTHUN_PHASE, PHASE_EYE_GREEN_BEAM); @@ -226,7 +226,7 @@ public: Spawned->AI()->AttackStart(target); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -394,7 +394,7 @@ public: } } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { switch (instance->GetData(DATA_CTHUN_PHASE)) { @@ -445,7 +445,7 @@ class boss_cthun : public CreatureScript public: boss_cthun() : CreatureScript("boss_cthun") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<cthunAI>(creature); } @@ -485,7 +485,7 @@ public: //Stomach map, bool = true then in stomach UNORDERED_MAP<uint64, bool> Stomach_Map; - void Reset() OVERRIDE + void Reset() override { //One random wisper every 90 - 300 seconds WisperTimer = 90000; @@ -517,7 +517,7 @@ public: instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } @@ -566,7 +566,7 @@ public: return (*j); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -840,12 +840,12 @@ public: } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { switch (instance->GetData(DATA_CTHUN_PHASE)) { @@ -871,7 +871,7 @@ public: } } - void DoAction(int32 param) OVERRIDE + void DoAction(int32 param) override { switch (param) { @@ -889,7 +889,7 @@ class npc_eye_tentacle : public CreatureScript public: npc_eye_tentacle() : CreatureScript("npc_eye_tentacle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new eye_tentacleAI(creature); } @@ -915,13 +915,13 @@ public: uint32 KillSelfTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() OVERRIDE + void Reset() override { //Mind flay half a second after we spawn MindflayTimer = 500; @@ -930,12 +930,12 @@ public: KillSelfTimer = 35000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -968,7 +968,7 @@ class npc_claw_tentacle : public CreatureScript public: npc_claw_tentacle() : CreatureScript("npc_claw_tentacle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new claw_tentacleAI(creature); } @@ -996,13 +996,13 @@ public: uint32 EvadeTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() OVERRIDE + void Reset() override { //First rupture should happen half a second after we spawn GroundRuptureTimer = 500; @@ -1010,12 +1010,12 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -1083,7 +1083,7 @@ class npc_giant_claw_tentacle : public CreatureScript public: npc_giant_claw_tentacle() : CreatureScript("npc_giant_claw_tentacle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new giant_claw_tentacleAI(creature); } @@ -1113,13 +1113,13 @@ public: uint32 EvadeTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() OVERRIDE + void Reset() override { //First rupture should happen half a second after we spawn GroundRuptureTimer = 500; @@ -1128,12 +1128,12 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -1208,7 +1208,7 @@ class npc_giant_eye_tentacle : public CreatureScript public: npc_giant_eye_tentacle() : CreatureScript("npc_giant_eye_tentacle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new giant_eye_tentacleAI(creature); } @@ -1232,24 +1232,24 @@ public: uint32 BeamTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() OVERRIDE + void Reset() override { //Green Beam half a second after we spawn BeamTimer = 500; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -1275,7 +1275,7 @@ class npc_giant_flesh_tentacle : public CreatureScript public: npc_giant_flesh_tentacle() : CreatureScript("npc_giant_flesh_tentacle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new flesh_tentacleAI(creature); } @@ -1287,7 +1287,7 @@ public: SetCombatMovement(false); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (TempSummon* summon = me->ToTempSummon()) if (Unit* summoner = summon->GetSummoner()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 910b09ec278..5eced848b47 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -46,7 +46,7 @@ class boss_fankriss : public CreatureScript public: boss_fankriss() : CreatureScript("boss_fankriss") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_fankrissAI(creature); } @@ -65,7 +65,7 @@ public: Creature* Hatchling; Creature* Spawn; - void Reset() OVERRIDE + void Reset() override { MortalWound_Timer = urand(10000, 15000); SpawnHatchlings_Timer = urand(6000, 12000); @@ -96,11 +96,11 @@ public: Spawn->AI()->AttackStart(victim); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 34dc224214e..5cc1670d8fb 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -44,7 +44,7 @@ class boss_huhuran : public CreatureScript public: boss_huhuran() : CreatureScript("boss_huhuran") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_huhuranAI(creature); } @@ -63,7 +63,7 @@ public: bool Frenzy; bool Berserk; - void Reset() OVERRIDE + void Reset() override { Frenzy_Timer = urand(25000, 35000); Wyvern_Timer = urand(18000, 28000); @@ -76,11 +76,11 @@ public: Berserk = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 233dc12de4f..26866de9aa8 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -41,7 +41,7 @@ class boss_ouro : public CreatureScript public: boss_ouro() : CreatureScript("boss_ouro") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ouroAI(creature); } @@ -60,7 +60,7 @@ public: bool Enrage; bool Submerged; - void Reset() OVERRIDE + void Reset() override { Sweep_Timer = urand(5000, 10000); SandBlast_Timer = urand(20000, 35000); @@ -73,12 +73,12 @@ public: Submerged = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCastVictim(SPELL_BIRTH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index b8042e8e106..e9eb9d58ca8 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -46,7 +46,7 @@ class boss_sartura : public CreatureScript public: boss_sartura() : CreatureScript("boss_sartura") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_sarturaAI(creature); } @@ -67,7 +67,7 @@ public: bool WhirlWind; bool AggroReset; - void Reset() OVERRIDE + void Reset() override { WhirlWind_Timer = 30000; WhirlWindRandom_Timer = urand(3000, 7000); @@ -83,22 +83,22 @@ public: } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -189,7 +189,7 @@ class npc_sartura_royal_guard : public CreatureScript public: npc_sartura_royal_guard() : CreatureScript("npc_sartura_royal_guard") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_sartura_royal_guardAI(creature); } @@ -208,7 +208,7 @@ public: bool WhirlWind; bool AggroReset; - void Reset() OVERRIDE + void Reset() override { WhirlWind_Timer = 30000; WhirlWindRandom_Timer = urand(3000, 7000); @@ -221,11 +221,11 @@ public: AggroReset = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 4708a563098..51384cc117d 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -57,26 +57,26 @@ class boss_skeram : public CreatureScript { boss_skeramAI(Creature* creature) : BossAI(creature, DATA_SKERAM) { } - void Reset() OVERRIDE + void Reset() override { _flag = 0; _hpct = 75.0f; me->SetVisible(true); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { ScriptedAI::EnterEvadeMode(); if (me->IsSummon()) ((TempSummon*)me)->UnSummon(); } - void JustSummoned(Creature* creature) OVERRIDE + void JustSummoned(Creature* creature) override { // Shift the boss and images (Get it? *Shift*?) uint8 rand = 0; @@ -113,7 +113,7 @@ class boss_skeram : public CreatureScript creature->SetHealth(creature->GetMaxHealth() * (me->GetHealthPct() / 100.0f)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (!me->IsSummon()) Talk(SAY_DEATH); @@ -121,7 +121,7 @@ class boss_skeram : public CreatureScript me->RemoveCorpse(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.Reset(); @@ -134,7 +134,7 @@ class boss_skeram : public CreatureScript Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -189,7 +189,7 @@ class boss_skeram : public CreatureScript uint8 _flag; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_skeramAI(creature); } @@ -222,13 +222,13 @@ class spell_skeram_arcane_explosion : public SpellScriptLoader targets.remove_if(PlayerOrPetCheck()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_skeram_arcane_explosion_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_skeram_arcane_explosion_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index d84279f1e8b..6775d84d435 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -106,7 +106,7 @@ struct boss_twinemperorsAI : public ScriptedAI return Unit::GetCreature(*me, instance->GetData64(IAmVeklor() ? DATA_VEKNILASH : DATA_VEKLOR)); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { Unit* pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -123,7 +123,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Creature* pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -137,12 +137,12 @@ struct boss_twinemperorsAI : public ScriptedAI DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_DEATH : SOUND_VN_DEATH); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_KILL : SOUND_VN_KILL); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { DoZoneInCombat(); Creature* pOtherBoss = GetOtherBoss(); @@ -160,7 +160,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void SpellHit(Unit* caster, const SpellInfo* entry) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* entry) override { if (caster == me) return; @@ -286,7 +286,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || me->GetVictim()) @@ -386,7 +386,7 @@ class boss_veknilash : public CreatureScript public: boss_veknilash() : CreatureScript("boss_veknilash") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_veknilashAI>(creature); } @@ -405,7 +405,7 @@ public: Creature* Summoned; - void Reset() OVERRIDE + void Reset() override { TwinReset(); UpperCut_Timer = urand(14000, 29000); @@ -424,7 +424,7 @@ public: target->SetFullHealth(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -472,7 +472,7 @@ class boss_veklor : public CreatureScript public: boss_veklor() : CreatureScript("boss_veklor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_veklorAI>(creature); } @@ -492,7 +492,7 @@ public: Creature* Summoned; - void Reset() OVERRIDE + void Reset() override { TwinReset(); ShadowBolt_Timer = 0; @@ -511,7 +511,7 @@ public: target->SetFullHealth(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -572,7 +572,7 @@ public: //DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index 20100dfc5dd..d49a6a312da 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -93,14 +93,14 @@ class boss_viscidus : public CreatureScript { boss_viscidusAI(Creature* creature) : BossAI(creature, DATA_VISCIDUS) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _hitcounter = 0; _phase = PHASE_FROST; } - void DamageTaken(Unit* attacker, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* attacker, uint32& /*damage*/) override { if (_phase != PHASE_MELEE) return; @@ -139,7 +139,7 @@ class boss_viscidus : public CreatureScript Talk(EMOTE_CRACK); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if ((spell->GetSchoolMask() & SPELL_SCHOOL_MASK_FROST) && _phase == PHASE_FROST && me->GetHealthPct() > 5.0f) { @@ -168,7 +168,7 @@ class boss_viscidus : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.Reset(); @@ -182,19 +182,19 @@ class boss_viscidus : public CreatureScript events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000)); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { summons.DespawnAll(); ScriptedAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCast(me, SPELL_VISCIDUS_SUICIDE); summons.DespawnAll(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -245,7 +245,7 @@ class boss_viscidus : public CreatureScript Phases _phase; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_viscidusAI(creature); } @@ -260,7 +260,7 @@ class npc_glob_of_viscidus : public CreatureScript { npc_glob_of_viscidusAI(Creature* creature) : ScriptedAI(creature) { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { InstanceScript* Instance = me->GetInstanceScript(); @@ -283,7 +283,7 @@ class npc_glob_of_viscidus : public CreatureScript } } - void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE + void MovementInform(uint32 /*type*/, uint32 id) override { if (id == ROOM_CENTER) { @@ -294,7 +294,7 @@ class npc_glob_of_viscidus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_glob_of_viscidusAI>(creature); } 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 b1402f95135..5780da5e759 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -32,7 +32,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript public: instance_temple_of_ahnqiraj() : InstanceMapScript("instance_temple_of_ahnqiraj", 531) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_temple_of_ahnqiraj_InstanceMapScript(map); } @@ -56,7 +56,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript uint32 CthunPhase; - void Initialize() OVERRIDE + 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) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -99,13 +99,13 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript } } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { //not active in AQ40 return false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -133,7 +133,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -153,7 +153,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript return 0; } // end GetData64 - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 7fc6af08d9d..aa9180d79c2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -64,7 +64,7 @@ class npc_anubisath_sentinel : public CreatureScript public: npc_anubisath_sentinel() : CreatureScript("npc_anubisath_sentinel") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new aqsentinelAI(creature); } @@ -213,7 +213,7 @@ public: bool gatherOthersWhenAggro; - void Reset() OVERRIDE + void Reset() override { if (!me->isDead()) { @@ -237,7 +237,7 @@ public: me->AddAura(id, me); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (gatherOthersWhenAggro) GetOtherSentinels(who); @@ -246,7 +246,7 @@ public: DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { for (int ni=0; ni<3; ++ni) { diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index f903d1b6da8..9b8397ec6cd 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -34,7 +34,7 @@ class instance_wailing_caverns : public InstanceMapScript public: instance_wailing_caverns() : InstanceMapScript("instance_wailing_caverns", 43) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_wailing_caverns_InstanceMapScript(map); } @@ -48,7 +48,7 @@ public: bool yelled; uint64 NaralexGUID; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -56,13 +56,13 @@ public: NaralexGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { if (creature->GetEntry() == DATA_NARALEX) NaralexGUID = creature->GetGUID(); } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -80,7 +80,7 @@ public: if (data == DONE)SaveToDB(); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -98,13 +98,13 @@ public: return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { if (data == DATA_NARALEX)return NaralexGUID; return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -117,7 +117,7 @@ public: return saveStream.str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index 72ced3d3399..516da307bfd 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -79,12 +79,12 @@ class npc_disciple_of_naralex : public CreatureScript public: npc_disciple_of_naralex() : CreatureScript("npc_disciple_of_naralex") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_disciple_of_naralexAI>(creature); } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); InstanceScript* instance = creature->GetInstanceScript(); @@ -106,7 +106,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { InstanceScript* instance = creature->GetInstanceScript(); @@ -150,7 +150,7 @@ public: uint32 eventProgress; InstanceScript* instance; - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -179,17 +179,17 @@ public: } } - void Reset() OVERRIDE + void Reset() override { } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(SAY_ATTACKED, who); } - void JustDied(Unit* /*slayer*/) OVERRIDE + void JustDied(Unit* /*slayer*/) override { instance->SetData(TYPE_NARALEX_EVENT, FAIL); instance->SetData(TYPE_NARALEX_PART1, FAIL); @@ -197,12 +197,12 @@ public: instance->SetData(TYPE_NARALEX_PART3, FAIL); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (currentEvent != TYPE_NARALEX_PART3) npc_escortAI::UpdateAI(diff); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp index 2ddd60ca442..f0035cc921c 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp @@ -61,7 +61,7 @@ public: { boss_zum_rahAI(Creature* creature) : BossAI(creature, DATA_ZUM_RAH) { } - void Reset() OVERRIDE + void Reset() override { me->setFaction(ZUMRAH_FRIENDLY_FACTION); // areatrigger sets faction to enemy _ward80 = false; @@ -69,24 +69,24 @@ public: _heal30 = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_SANCT_INVADE); events.ScheduleEvent(EVENT_SHADOW_BOLT, 1000); events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetData(DATA_ZUM_RAH, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -147,7 +147,7 @@ public: }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_zum_rahAI>(creature); } diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 8a7b5effa67..8139f45bf46 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -101,7 +101,7 @@ class instance_zulfarrak : public InstanceMapScript public: instance_zulfarrak() : InstanceMapScript("instance_zulfarrak", 209) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_zulfarrak_InstanceMapScript(map); } @@ -124,7 +124,7 @@ public: uint32 addGroupSize; uint32 waypoint; - void Initialize() OVERRIDE + void Initialize() override { GahzRillaEncounter = NOT_STARTED; ZumrahGUID = 0; @@ -141,7 +141,7 @@ public: waypoint = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -177,7 +177,7 @@ public: } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -187,7 +187,7 @@ public: } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -197,7 +197,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -219,7 +219,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 4b95d33a81e..ecb28a5b0cb 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -64,7 +64,7 @@ class npc_sergeant_bly : public CreatureScript public: npc_sergeant_bly() : CreatureScript("npc_sergeant_bly") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -76,7 +76,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -95,7 +95,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_sergeant_blyAI>(creature); } @@ -116,7 +116,7 @@ public: uint32 Revenge_Timer; //this is wrong, spell should never be used unless me->GetVictim() dodge, parry or block attack. Trinity support required. uint64 PlayerGUID; - void Reset() OVERRIDE + void Reset() override { ShieldBash_Timer = 5000; Revenge_Timer = 8000; @@ -124,7 +124,7 @@ public: me->setFaction(FACTION_FRIENDLY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (postGossipStep>0 && postGossipStep<4) { @@ -179,7 +179,7 @@ public: DoMeleeAttackIfReady(); } - void DoAction(int32 /*param*/) OVERRIDE + void DoAction(int32 /*param*/) override { postGossipStep=1; Text_Timer = 0; @@ -204,7 +204,7 @@ class go_troll_cage : public GameObjectScript public: go_troll_cage() : GameObjectScript("go_troll_cage") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { if (InstanceScript* instance = go->GetInstanceScript()) { @@ -258,7 +258,7 @@ class npc_weegli_blastfuse : public CreatureScript public: npc_weegli_blastfuse() : CreatureScript("npc_weegli_blastfuse") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -270,7 +270,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -291,7 +291,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_weegli_blastfuseAI>(creature); } @@ -311,22 +311,22 @@ public: bool destroyingDoor; InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { /*instance->SetData(0, NOT_STARTED);*/ } - void AttackStart(Unit* victim) OVERRIDE + void AttackStart(Unit* victim) override { AttackStartCaster(victim, 10);//keep back & toss bombs/shoot } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { /*instance->SetData(0, DONE);*/ } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -351,7 +351,7 @@ public: } } - void MovementInform(uint32 /*type*/, uint32 /*id*/) OVERRIDE + void MovementInform(uint32 /*type*/, uint32 /*id*/) override { if (instance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN) { @@ -368,7 +368,7 @@ public: }; } - void DoAction(int32 /*param*/) OVERRIDE + void DoAction(int32 /*param*/) override { DestroyDoor(); } @@ -405,7 +405,7 @@ class go_shallow_grave : public GameObjectScript public: go_shallow_grave() : GameObjectScript("go_shallow_grave") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { // randomly summon a zombie or dead hero the first time a grave is used if (go->GetUseCount() == 0) @@ -437,7 +437,7 @@ class at_zumrah : public AreaTriggerScript public: at_zumrah() : AreaTriggerScript("at_zumrah") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { Creature* pZumrah = player->FindNearestCreature(ZUMRAH_ID, 30.0f); diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index ec28ee42625..2b8dbdaab6c 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -63,16 +63,16 @@ public: { npc_torekAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE + void Reset() override { rend_Timer = 5000; thunderclap_Timer = 8000; _completed = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } @@ -88,7 +88,7 @@ public: } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (Player* player = GetPlayerForEscort()) { @@ -118,7 +118,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -145,7 +145,7 @@ public: }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_torekAI(creature); } @@ -183,15 +183,15 @@ public: { npc_ruul_snowhoofAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE + void Reset() override { if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20)) Cage->SetGoState(GO_STATE_READY); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } @@ -205,7 +205,7 @@ public: } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -234,13 +234,13 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ruul_snowhoofAI(creature); } @@ -300,14 +300,14 @@ public: { npc_muglashAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE + void Reset() override { eventTimer = 10000; waveId = 0; _isBrazierExtinguished = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (Player* player = GetPlayerForEscort()) if (HasEscortState(STATE_ESCORT_PAUSED)) @@ -318,14 +318,14 @@ public: } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_VORSHA); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } @@ -340,7 +340,7 @@ public: } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (Player* player = GetPlayerForEscort()) { @@ -396,7 +396,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -426,7 +426,7 @@ public: }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_muglashAI(creature); } @@ -437,7 +437,7 @@ class go_naga_brazier : public GameObjectScript public: go_naga_brazier() : GameObjectScript("go_naga_brazier") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { if (Creature* creature = GetClosestCreatureWithEntry(go, NPC_MUGLASH, INTERACTION_DISTANCE*2)) { diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 3c7e5a13a98..51e97b43554 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -70,7 +70,7 @@ public: bool CanSayHelp; - void Reset() OVERRIDE + void Reset() override { pCaster = 0; @@ -88,9 +88,9 @@ public: me->SetStandState(UNIT_STAND_STATE_SLEEP); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (CanSayHelp && who->GetTypeId() == TYPEID_PLAYER && me->IsFriendlyTo(who) && me->IsWithinDistInMap(who, 25.0f)) { @@ -102,7 +102,7 @@ public: } } - void SpellHit(Unit* Caster, const SpellInfo* Spell) OVERRIDE + void SpellHit(Unit* Caster, const SpellInfo* Spell) override { if (Spell->SpellFamilyFlags[2] & 0x080000000) { @@ -117,7 +117,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (SayThanksTimer) { @@ -160,7 +160,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_draenei_survivorAI(creature); } @@ -199,7 +199,7 @@ public: IsTreeEvent = true; } - void Reset() OVERRIDE + void Reset() override { DynamiteTimer = 8000; EmoteTimer = urand(120000, 150000); @@ -210,19 +210,19 @@ public: IsTreeEvent = false; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(ATTACK_YELL, who); } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override { player->CLOSE_GOSSIP_MENU(); me->setFaction(FACTION_HOSTILE); me->Attack(player, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat() && !IsTreeEvent) { @@ -256,7 +256,7 @@ public: bool IsTreeEvent; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_engineer_spark_overgrindAI(creature); } @@ -275,7 +275,7 @@ public: { npc_injured_draeneiAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); me->SetHealth(me->CountPctFromMaxHealth(15)); @@ -291,14 +291,14 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_injured_draeneiAI(creature); } @@ -329,9 +329,9 @@ public: { npc_magwinAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(SAY_AGGRO, who); } @@ -345,7 +345,7 @@ public: } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (Player* player = GetPlayerForEscort()) { @@ -370,7 +370,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_magwinAI(creature); } @@ -418,14 +418,14 @@ public: bool EventStarted; - void Reset() OVERRIDE + void Reset() override { SparkGUID = 0; Step = 0; StartEvent(); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void StartEvent() { @@ -525,7 +525,7 @@ public: TC_LOG_ERROR("scripts", "SD2 ERROR: FlagList is empty!"); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (SayTimer <= diff) { @@ -537,7 +537,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_geezleAI(creature); } @@ -558,7 +558,7 @@ class go_ravager_cage : public GameObjectScript public: go_ravager_cage() : GameObjectScript("go_ravager_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_STRENGTH_ONE) == QUEST_STATUS_INCOMPLETE) @@ -586,7 +586,7 @@ public: uint32 RendTimer; uint32 EnragingBiteTimer; - void Reset() OVERRIDE + void Reset() override { RendTimer = 30000; EnragingBiteTimer = 20000; @@ -595,7 +595,7 @@ public: me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -618,7 +618,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_death_ravagerAI(creature); } @@ -649,7 +649,7 @@ class npc_stillpine_capitive : public CreatureScript { npc_stillpine_capitiveAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { if (GameObject* cage = me->FindNearestGameObject(GO_BRISTELIMB_CAGE, 5.0f)) { @@ -672,7 +672,7 @@ class npc_stillpine_capitive : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_INIT, pos); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE || id != POINT_INIT) return; @@ -684,7 +684,7 @@ class npc_stillpine_capitive : public CreatureScript _events.ScheduleEvent(EVENT_DESPAWN, 3500); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!_movementComplete) return; @@ -701,7 +701,7 @@ class npc_stillpine_capitive : public CreatureScript bool _movementComplete; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_stillpine_capitiveAI(creature); } @@ -712,7 +712,7 @@ class go_bristlelimb_cage : public GameObjectScript public: go_bristlelimb_cage() : GameObjectScript("go_bristlelimb_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->SetGoState(GO_STATE_READY); if (player->GetQuestStatus(QUEST_THE_PROPHECY_OF_AKIDA) == QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index c935a83b3ee..05aab1ef723 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -54,11 +54,11 @@ public: { npc_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { uint32 spawnCreatureID = 0; @@ -79,7 +79,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_webbed_creatureAI(creature); } @@ -103,7 +103,7 @@ class go_princess_stillpines_cage : public GameObjectScript public: go_princess_stillpines_cage() : GameObjectScript("go_princess_stillpines_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->SetGoState(GO_STATE_READY); if (Creature* stillpine = go->FindNearestCreature(NPC_PRINCESS_STILLPINE, 25, true)) @@ -124,7 +124,7 @@ public: { npc_princess_stillpineAI(Creature* creature) : ScriptedAI(creature) { } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == 1) { @@ -134,7 +134,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_princess_stillpineAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index 106362cd677..5cb58058151 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -96,7 +96,7 @@ public: } }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) && creature->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF)) { @@ -108,7 +108,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_aged_dying_ancient_kodoAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index e587c98445b..ca4bafdd453 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -43,7 +43,7 @@ class npc_lazy_peon : public CreatureScript public: npc_lazy_peon() : CreatureScript("npc_lazy_peon") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_lazy_peonAI(creature); } @@ -57,7 +57,7 @@ public: uint32 RebuffTimer; bool work; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; RebuffTimer = 0; @@ -86,7 +86,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (work == true) me->HandleEmoteCommand(EMOTE_ONESHOT_WORK_CHOPWOOD); @@ -125,7 +125,7 @@ class spell_voodoo : public SpellScriptLoader { PrepareSpellScript(spell_voodoo_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BREW) || !sSpellMgr->GetSpellInfo(SPELL_GHOSTLY) || !sSpellMgr->GetSpellInfo(SPELL_HEX1) || !sSpellMgr->GetSpellInfo(SPELL_HEX2) || @@ -142,13 +142,13 @@ class spell_voodoo : public SpellScriptLoader GetCaster()->CastSpell(target, spellid, false); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_voodoo_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_voodoo_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index 8894a1378f9..91c481a3a9d 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -71,7 +71,7 @@ class npc_risen_husk_spirit : public CreatureScript { npc_risen_husk_spiritAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { events.Reset(); if (me->GetEntry() == NPC_RISEN_HUSK) @@ -80,7 +80,7 @@ class npc_risen_husk_spirit : public CreatureScript events.ScheduleEvent(EVENT_INTANGIBLE_PRESENCE, 5000); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (killer->GetTypeId() == TYPEID_PLAYER) { @@ -92,7 +92,7 @@ class npc_risen_husk_spirit : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -123,7 +123,7 @@ class npc_risen_husk_spirit : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_risen_husk_spiritAI(creature); } @@ -154,7 +154,7 @@ class npc_theramore_guard : public CreatureScript public: npc_theramore_guard() : CreatureScript("npc_theramore_guard") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_DISCREDITING_THE_DESERTERS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THERAMORE_GUARD, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); @@ -164,7 +164,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); @@ -182,7 +182,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_theramore_guardAI(creature); } @@ -195,13 +195,13 @@ public: uint32 Step; bool bYellTimer; - void Reset() OVERRIDE + void Reset() override { bYellTimer = false; Step = 0; } - void UpdateAI(uint32 Diff) OVERRIDE + void UpdateAI(uint32 Diff) override { if (!me->HasAura(SPELL_PROPAGANDIZED)) me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -246,7 +246,7 @@ class npc_lady_jaina_proudmoore : public CreatureScript public: npc_lady_jaina_proudmoore() : CreatureScript("npc_lady_jaina_proudmoore") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_SENDER_INFO) @@ -257,7 +257,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -286,7 +286,7 @@ class npc_nat_pagle : public CreatureScript public: npc_nat_pagle() : CreatureScript("npc_nat_pagle") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -295,7 +295,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -339,7 +339,7 @@ class npc_private_hendel : public CreatureScript public: npc_private_hendel() : CreatureScript("npc_private_hendel") { } - bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT16) creature->setFaction(FACTION_HOSTILE); @@ -347,7 +347,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_private_hendelAI(creature); } @@ -356,12 +356,12 @@ public: { npc_private_hendelAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->RestoreFaction(); } - void AttackedBy(Unit* pAttacker) OVERRIDE + void AttackedBy(Unit* pAttacker) override { if (me->GetVictim()) return; @@ -372,7 +372,7 @@ public: AttackStart(pAttacker); } - void DamageTaken(Unit* pDoneBy, uint32 &Damage) OVERRIDE + void DamageTaken(Unit* pDoneBy, uint32 &Damage) override { if (Damage > me->GetHealth() || me->HealthBelowPctDamaged(20, Damage)) { @@ -406,7 +406,7 @@ class npc_zelfrax : public CreatureScript public: npc_zelfrax() : CreatureScript("npc_zelfrax") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_zelfraxAI(creature); } @@ -418,7 +418,7 @@ public: MoveToDock(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -433,7 +433,7 @@ public: } } - void MovementInform(uint32 Type, uint32 /*Id*/) OVERRIDE + void MovementInform(uint32 Type, uint32 /*Id*/) override { if (Type != POINT_MOTION_TYPE) return; @@ -455,7 +455,7 @@ public: Talk(SAY_ZELFRAX2); } - void UpdateAI(uint32 /*Diff*/) OVERRIDE + void UpdateAI(uint32 /*Diff*/) override { if (!UpdateVictim()) return; @@ -491,12 +491,12 @@ class npc_stinky : public CreatureScript public: npc_stinky() : CreatureScript("npc_stinky") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_stinkyAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_STINKYS_ESCAPE_H || quest->GetQuestId() == QUEST_STINKYS_ESCAPE_A) { @@ -515,7 +515,7 @@ public: { npc_stinkyAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -560,14 +560,14 @@ public: } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(SAY_ATTACKED_1, who); } - void Reset() OVERRIDE { } + void Reset() override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Player* player = GetPlayerForEscort(); if (player && HasEscortState(STATE_ESCORT_ESCORTING)) @@ -580,7 +580,7 @@ public: } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -609,7 +609,7 @@ class spell_ooze_zap : public SpellScriptLoader { PrepareSpellScript(spell_ooze_zap_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_OOZE_ZAP)) return false; @@ -634,14 +634,14 @@ class spell_ooze_zap : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_ooze_zap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_ooze_zap_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_ooze_zap_SpellScript(); } @@ -656,7 +656,7 @@ class spell_ooze_zap_channel_end : public SpellScriptLoader { PrepareSpellScript(spell_ooze_zap_channel_end_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_OOZE_ZAP_CHANNEL_END)) return false; @@ -671,13 +671,13 @@ class spell_ooze_zap_channel_end : public SpellScriptLoader GetHitUnit()->Kill(GetHitUnit()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_ooze_zap_channel_end_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_ooze_zap_channel_end_SpellScript(); } @@ -692,7 +692,7 @@ class spell_energize_aoe : public SpellScriptLoader { PrepareSpellScript(spell_energize_aoe_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ENERGIZED)) return false; @@ -717,7 +717,7 @@ class spell_energize_aoe : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_energize_aoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_energize_aoe_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); @@ -725,7 +725,7 @@ class spell_energize_aoe : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_energize_aoe_SpellScript(); } @@ -746,7 +746,7 @@ class go_blackhoof_cage : public GameObjectScript public: go_blackhoof_cage() : GameObjectScript("go_blackhoof_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (Creature* prisoner = go->FindNearestCreature(NPC_THERAMORE_PRISONER, 1.0f)) diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 9c07e55707a..901946df74b 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -62,7 +62,7 @@ public: EventMap events; - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type != POINT_MOTION_TYPE) return; @@ -76,19 +76,19 @@ public: } } - void EnterCombat(Unit* /*attacker*/) OVERRIDE + void EnterCombat(Unit* /*attacker*/) override { events.Reset(); events.ScheduleEvent(EVENT_CAST_CLEAVE, urand(3000, 5000)); events.ScheduleEvent(EVENT_CAST_STARFALL, urand(8000, 10000)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCast(SPELL_OMEN_SUMMON_SPOTLIGHT); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_ELUNE_CANDLE) { @@ -99,7 +99,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -123,7 +123,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_omenAI(creature); } @@ -140,13 +140,13 @@ public: EventMap events; - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_DESPAWN, 5*MINUTE*IN_MILLISECONDS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -166,7 +166,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_giant_spotlightAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp index 92ffdaa567b..23def62047d 100644 --- a/src/server/scripts/Kalimdor/zone_mulgore.cpp +++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp @@ -54,7 +54,7 @@ class npc_kyle_frenzied : public CreatureScript public: npc_kyle_frenzied() : CreatureScript("npc_kyle_frenzied") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kyle_frenziedAI (creature); } @@ -69,7 +69,7 @@ public: uint32 EventTimer; uint8 EventPhase; - void Reset() OVERRIDE + void Reset() override { EventActive = false; IsMovingToLunch = false; @@ -101,7 +101,7 @@ public: } } - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type != POINT_MOTION_TYPE || !EventActive) return; @@ -110,7 +110,7 @@ public: IsMovingToLunch = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (EventActive) { diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 7fe8ac5d5ac..3dd2419de4a 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -65,7 +65,7 @@ class npcs_rutgar_and_frankal : public CreatureScript public: npcs_rutgar_and_frankal() : CreatureScript("npcs_rutgar_and_frankal") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -129,7 +129,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -415,7 +415,7 @@ class npc_anachronos_the_ancient : public CreatureScript public: npc_anachronos_the_ancient() : CreatureScript("npc_anachronos_the_ancient") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_anachronos_the_ancientAI(creature); } @@ -435,7 +435,7 @@ public: uint64 PlayerGUID; bool eventEnd; - void Reset() OVERRIDE + void Reset() override { AnimationTimer = 1500; AnimationCount = 0; @@ -717,7 +717,7 @@ public: } ++AnimationCount; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (AnimationTimer) { @@ -743,7 +743,7 @@ class npc_qiraj_war_spawn : public CreatureScript public: npc_qiraj_war_spawn() : CreatureScript("npc_qiraj_war_spawn") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_qiraj_war_spawnAI(creature); } @@ -758,7 +758,7 @@ public: bool Timers; bool hasTarget; - void Reset() OVERRIDE + void Reset() override { MobGUID = 0; PlayerGUID = 0; @@ -766,10 +766,10 @@ public: hasTarget = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*slayer*/) OVERRIDE; + void EnterCombat(Unit* /*who*/) override { } + void JustDied(Unit* /*slayer*/) override; - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Timers) { @@ -856,7 +856,7 @@ class npc_anachronos_quest_trigger : public CreatureScript public: npc_anachronos_quest_trigger() : CreatureScript("npc_anachronos_quest_trigger") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_anachronos_quest_triggerAI(creature); } @@ -877,7 +877,7 @@ public: bool Announced; bool Failed; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; @@ -970,7 +970,7 @@ public: Announced = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!PlayerGUID || !EventStarted) return; @@ -1017,7 +1017,7 @@ class go_crystalline_tear : public GameObjectScript public: go_crystalline_tear() : GameObjectScript("go_crystalline_tear") { } - bool OnQuestAccept(Player* player, GameObject* go, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, GameObject* go, Quest const* quest) override { if (quest->GetQuestId() == QUEST_A_PAWN_ON_THE_ETERNAL_BOARD) { @@ -1288,7 +1288,7 @@ class go_wind_stone : public GameObjectScript } public: - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { uint8 rank = GetPlayerRank(player); @@ -1366,7 +1366,7 @@ class go_wind_stone : public GameObjectScript return true; } - bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); player->PlayerTalkClass->SendCloseGossip(); diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 1e1c3a3fc3c..780ee046eda 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -54,7 +54,7 @@ class npc_aquementas : public CreatureScript public: npc_aquementas() : CreatureScript("npc_aquementas") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_aquementasAI (creature); } @@ -70,7 +70,7 @@ public: uint32 FrostShockTimer; uint32 AquaJetTimer; - void Reset() OVERRIDE + void Reset() override { SendItemTimer = 0; SwitchFactionTimer = 10000; @@ -102,7 +102,7 @@ public: Talk(AGGRO_YELL_AQUE, who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (isFriendly) { @@ -171,7 +171,7 @@ class npc_custodian_of_time : public CreatureScript public: npc_custodian_of_time() : CreatureScript("npc_custodian_of_time") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_custodian_of_timeAI(creature); } @@ -265,10 +265,10 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void Reset() override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); } @@ -361,7 +361,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_OOX17AI(creature); } @@ -398,14 +398,14 @@ public: } } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_OOX_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } @@ -451,7 +451,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toogaAI(creature); } @@ -466,7 +466,7 @@ public: uint64 TortaGUID; - void Reset() OVERRIDE + void Reset() override { CheckSpeechTimer = 2500; PostEventTimer = 1000; diff --git a/src/server/scripts/Kalimdor/zone_teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp index a94813f2b0f..e1b2144c97c 100644 --- a/src/server/scripts/Kalimdor/zone_teldrassil.cpp +++ b/src/server/scripts/Kalimdor/zone_teldrassil.cpp @@ -50,7 +50,7 @@ class npc_mist : public CreatureScript public: npc_mist() : CreatureScript("npc_mist") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_MIST) if (npc_mistAI* pMistAI = CAST_AI(npc_mist::npc_mistAI, creature->AI())) @@ -59,7 +59,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_mistAI(creature); } @@ -68,9 +68,9 @@ public: { npc_mistAI(Creature* creature) : FollowerAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { FollowerAI::MoveInLineOfSight(who); @@ -98,7 +98,7 @@ public: } //call not needed here, no known abilities - /*void UpdateFollowerAI(const uint32 Diff) OVERRIDE + /*void UpdateFollowerAI(const uint32 Diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 1498c00d0fb..b9bfedc59e3 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -50,7 +50,7 @@ class npc_beaten_corpse : public CreatureScript public: npc_beaten_corpse() : CreatureScript("npc_beaten_corpse") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF +1) @@ -61,7 +61,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CORPSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -97,7 +97,7 @@ class npc_gilthares : public CreatureScript public: npc_gilthares() : CreatureScript("npc_gilthares") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_FREE_FROM_HOLD) { @@ -112,7 +112,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_giltharesAI(creature); } @@ -121,9 +121,9 @@ public: { npc_giltharesAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -153,7 +153,7 @@ public: } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { //not always use if (rand()%4) @@ -186,7 +186,7 @@ class npc_taskmaster_fizzule : public CreatureScript public: npc_taskmaster_fizzule() : CreatureScript("npc_taskmaster_fizzule") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_taskmaster_fizzuleAI(creature); } @@ -203,7 +203,7 @@ public: uint32 ResetTimer; uint8 FlareCount; - void Reset() OVERRIDE + void Reset() override { IsFriend = false; ResetTimer = 120000; @@ -224,7 +224,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY) { @@ -235,9 +235,9 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsFriend) { @@ -254,7 +254,7 @@ public: DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* /*player*/, uint32 emote) OVERRIDE + void ReceiveEmote(Player* /*player*/, uint32 emote) override { if (emote == TEXT_EMOTE_SALUTE) { @@ -302,7 +302,7 @@ class npc_twiggy_flathead : public CreatureScript public: npc_twiggy_flathead() : CreatureScript("npc_twiggy_flathead") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_twiggy_flatheadAI(creature); } @@ -322,7 +322,7 @@ public: uint64 AffrayChallenger[6]; uint64 BigWill; - void Reset() OVERRIDE + void Reset() override { EventInProgress = false; EventGrate = false; @@ -340,7 +340,7 @@ public: BigWill = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || !who->IsAlive() || EventInProgress) return; @@ -354,7 +354,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (EventInProgress) { @@ -521,7 +521,7 @@ public: uint32 PostEventTimer; uint32 PostEventCount; - void Reset() OVERRIDE + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -534,7 +534,7 @@ public: } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -557,7 +557,7 @@ public: } } - void WaypointStart(uint32 PointId) OVERRIDE + void WaypointStart(uint32 PointId) override { Player* player = GetPlayerForEscort(); @@ -576,7 +576,7 @@ public: } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_PILOT_WIZZ) me->SetStandState(UNIT_STAND_STATE_DEAD); @@ -585,7 +585,7 @@ public: summoned->AI()->AttackStart(me); } - void UpdateEscortAI(const uint32 Diff) OVERRIDE + void UpdateEscortAI(const uint32 Diff) override { if (!UpdateVictim()) { @@ -627,7 +627,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ESCAPE) { @@ -638,7 +638,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_wizzlecrank_shredderAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index b20ad20dea2..ea76dac829a 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -48,7 +48,7 @@ class npc_cairne_bloodhoof : public CreatureScript public: npc_cairne_bloodhoof() : CreatureScript("npc_cairne_bloodhoof") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_cairne_bloodhoofAI (creature); } @@ -63,7 +63,7 @@ public: uint32 ThunderclapTimer; uint32 UppercutTimer; - void Reset() OVERRIDE + void Reset() override { BerserkerChargeTimer = 30000; CleaveTimer = 5000; @@ -72,9 +72,9 @@ public: UppercutTimer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index 3ae8bc38120..11b720ad8d5 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -45,7 +45,7 @@ class npc_rivern_frostwind : public CreatureScript public: npc_rivern_frostwind() : CreatureScript("npc_rivern_frostwind") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -54,7 +54,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -292,7 +292,7 @@ class npc_ranshalla : public CreatureScript { public: npc_ranshalla() : CreatureScript("npc_ranshalla") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_GUARDIANS_ALTAR) { @@ -307,7 +307,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ranshallaAI(creature); } @@ -328,7 +328,7 @@ public: uint64 _voiceEluneGUID; uint64 _altarGUID; - void Reset() OVERRIDE + void Reset() override { _delayTimer = 0; } @@ -394,7 +394,7 @@ public: StartNextDialogueText(SAY_PRIESTESS_ALTAR_3); } - void WaypointReached(uint32 pointId) OVERRIDE + void WaypointReached(uint32 pointId) override { switch (pointId) { @@ -563,7 +563,7 @@ public: } - void UpdateEscortAI(const uint32 diff) OVERRIDE + void UpdateEscortAI(const uint32 diff) override { DialogueUpdate(diff); @@ -596,7 +596,7 @@ class go_elune_fire : public GameObjectScript { public: go_elune_fire() : GameObjectScript("go_elune_fire") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { // Check if we are using the torches or the altar bool isAltar = false; |