diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-04-29 19:39:40 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-04-29 19:39:40 +0200 |
| commit | f9a6aa5479dc843f7bb8b58d027b5d6d483d3fd5 (patch) | |
| tree | f45262b22a888300024b62c2fa4154eceed2e2bd /src/server/scripts/Outland | |
| parent | 1896b5cb5996e0f6e31c3693035257ac6d410392 (diff) | |
| parent | 24ae6a6802da5fc3f90b075d21cd4275e7138441 (diff) | |
Merge pull request #11950 from Dehravor/override-final-delete
Core/Misc: Remove obsolete C++11 backward compatibility macros
Diffstat (limited to 'src/server/scripts/Outland')
95 files changed, 1325 insertions, 1325 deletions
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index c9d452bfada..9ab35aa188b 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -54,7 +54,7 @@ class npc_stolen_soul : public CreatureScript public: npc_stolen_soul() : CreatureScript("npc_stolen_soul") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_stolen_soulAI(creature); } @@ -70,13 +70,13 @@ public: uint8 myClass; uint32 Class_Timer; - void Reset() OVERRIDE + void Reset() override { myClass = CLASS_NONE; Class_Timer = 1000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } void SetMyClass(uint8 myclass) @@ -84,7 +84,7 @@ public: myClass = myclass; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -161,7 +161,7 @@ class boss_exarch_maladaar : public CreatureScript public: boss_exarch_maladaar() : CreatureScript("boss_exarch_maladaar") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_exarch_maladaarAI(creature); } @@ -184,7 +184,7 @@ public: bool HasTaunted; bool Avatar_summoned; - void Reset() OVERRIDE + void Reset() override { soulmodel = 0; soulholder = 0; @@ -197,7 +197,7 @@ public: Avatar_summoned = false; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!HasTaunted && me->IsWithinDistInMap(who, 150.0f)) @@ -209,12 +209,12 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == ENTRY_STOLEN_SOUL) { @@ -232,7 +232,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (rand()%2) return; @@ -240,14 +240,14 @@ public: Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); //When Exarch Maladar is defeated D'ore appear. me->SummonCreature(19412, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 600000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -312,7 +312,7 @@ class npc_avatar_of_martyred : public CreatureScript public: npc_avatar_of_martyred() : CreatureScript("npc_avatar_of_martyred") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_avatar_of_martyredAI(creature); } @@ -323,16 +323,16 @@ public: uint32 Mortal_Strike_timer; - void Reset() OVERRIDE + void Reset() override { Mortal_Strike_timer = 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/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index f73ff46908b..bd65cd9fc89 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -53,7 +53,7 @@ class boss_shirrak_the_dead_watcher : public CreatureScript public: boss_shirrak_the_dead_watcher() : CreatureScript("boss_shirrak_the_dead_watcher") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_shirrak_the_dead_watcherAI(creature); } @@ -71,7 +71,7 @@ public: uint64 FocusedTargetGUID; - void Reset() OVERRIDE + void Reset() override { Inhibitmagic_Timer = 0; Attractmagic_Timer = 28000; @@ -80,10 +80,10 @@ public: FocusedTargetGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned && summoned->GetEntry() == NPC_FOCUS_FIRE) { @@ -97,7 +97,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Inhibitmagic_Timer if (Inhibitmagic_Timer <= diff) @@ -165,7 +165,7 @@ class npc_focus_fire : public CreatureScript public: npc_focus_fire() : CreatureScript("npc_focus_fire") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_focus_fireAI(creature); } @@ -179,16 +179,16 @@ public: uint32 FieryBlast_Timer; bool fiery1, fiery2; - void Reset() OVERRIDE + void Reset() override { FieryBlast_Timer = 3000+(rand()%1000); fiery1 = fiery2 = true; } - 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/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp index b003039f484..4b8a764fa03 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp @@ -32,7 +32,7 @@ class instance_auchenai_crypts : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_auchenai_crypts_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 7ccf7a7f9b2..67cc6b99e93 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -71,7 +71,7 @@ class boss_nexusprince_shaffar : public CreatureScript public: boss_nexusprince_shaffar() : CreatureScript("boss_nexusprince_shaffar") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_nexusprince_shaffarAI(creature); } @@ -91,7 +91,7 @@ public: bool HasTaunted; bool CanBlink; - void Reset() OVERRIDE + void Reset() override { Blink_Timer = 1500; Beacon_Timer = 10000; @@ -110,13 +110,13 @@ public: me->SummonCreature(NPC_BEACON, posX + dist, posY, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { summons.DespawnAll(); ScriptedAI::EnterEvadeMode(); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!HasTaunted && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 100.0f)) @@ -126,7 +126,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -134,7 +134,7 @@ public: summons.DoZoneInCombat(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_BEACON) { @@ -147,23 +147,23 @@ 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_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEAD); summons.DespawnAll(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -232,7 +232,7 @@ class npc_ethereal_beacon : public CreatureScript public: npc_ethereal_beacon() : CreatureScript("npc_ethereal_beacon") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ethereal_beaconAI(creature); } @@ -252,14 +252,14 @@ public: me->Kill(me); } - void Reset() OVERRIDE + void Reset() override { Apprentice_Timer = DUNGEON_MODE(20000, 10000); ArcaneBolt_Timer = 1000; Check_Timer = 1000; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { // Send Shaffar to fight Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); @@ -272,12 +272,12 @@ public: Shaffar->AI()->AttackStart(who); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me->GetVictim()); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -324,7 +324,7 @@ class npc_ethereal_apprentice : public CreatureScript public: npc_ethereal_apprentice() : CreatureScript("npc_ethereal_apprentice") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ethereal_apprenticeAI(creature); } @@ -337,13 +337,13 @@ public: bool isFireboltTurn; - void Reset() OVERRIDE + void Reset() override { Cast_Timer = 3000; isFireboltTurn = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -380,14 +380,14 @@ public: { npc_yorAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_DOUBLE_BREATH, urand(6000,9000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -414,7 +414,7 @@ public: EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_yorAI(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index 267acbc95eb..9a1d686f688 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -45,7 +45,7 @@ class boss_pandemonius : public CreatureScript public: boss_pandemonius() : CreatureScript("boss_pandemonius") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_pandemoniusAI(creature); } @@ -60,29 +60,29 @@ public: uint32 DarkShell_Timer; uint32 VoidBlast_Counter; - void Reset() OVERRIDE + void Reset() override { VoidBlast_Timer = 8000+rand()%15000; DarkShell_Timer = 20000; VoidBlast_Counter = 0; } - 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_KILL); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp index baf8d2b7d01..48bea45a95b 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp @@ -32,7 +32,7 @@ class instance_mana_tombs : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_mana_tombs_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp index d888121403f..1787933143c 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp @@ -69,7 +69,7 @@ class boss_anzu : public CreatureScript { boss_anzuAI(Creature* creature) : BossAI(creature, DATA_ANZU) { } - void Reset() OVERRIDE + void Reset() override { //_Reset(); events.Reset(); @@ -77,19 +77,19 @@ class boss_anzu : public CreatureScript _under66Percent = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 14000); events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 5000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*killer*/, uint32 &damage) override { if (me->HealthBelowPctDamaged(33, damage) && !_under33Percent) { @@ -106,7 +106,7 @@ class boss_anzu : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -157,7 +157,7 @@ class boss_anzu : public CreatureScript bool _under66Percent; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetSethekkHallsAI<boss_anzuAI>(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 25fdf84e739..098d35a292e 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -73,7 +73,7 @@ public: { boss_darkweaver_sythAI(Creature* creature) : BossAI(creature, DATA_DARKWEAVER_SYTH) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); summon90 = false; @@ -81,7 +81,7 @@ public: summon10 = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_FLAME_SHOCK, 2000); @@ -93,19 +93,19 @@ public: Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(target); @@ -124,7 +124,7 @@ public: DoCast(me, SPELL_SUMMON_SYTH_SHADOW, true); //right } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -192,7 +192,7 @@ public: bool summon10; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetSethekkHallsAI<boss_darkweaver_sythAI>(creature); } @@ -213,16 +213,16 @@ public: uint32 flameshock_timer; uint32 flamebuffet_timer; - void Reset() OVERRIDE + void Reset() override { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); flameshock_timer = 2500; flamebuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -247,7 +247,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_syth_fireAI(creature); } @@ -258,7 +258,7 @@ class npc_syth_arcane : public CreatureScript public: npc_syth_arcane() : CreatureScript("npc_syth_arcane") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_syth_arcaneAI(creature); } @@ -272,16 +272,16 @@ public: uint32 arcaneshock_timer; uint32 arcanebuffet_timer; - void Reset() OVERRIDE + void Reset() override { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, true); arcaneshock_timer = 2500; arcanebuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -312,7 +312,7 @@ class npc_syth_frost : public CreatureScript public: npc_syth_frost() : CreatureScript("npc_syth_frost") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_syth_frostAI(creature); } @@ -326,16 +326,16 @@ public: uint32 frostshock_timer; uint32 frostbuffet_timer; - void Reset() OVERRIDE + void Reset() override { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); frostshock_timer = 2500; frostbuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -367,7 +367,7 @@ class npc_syth_shadow : public CreatureScript public: npc_syth_shadow() : CreatureScript("npc_syth_shadow") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_syth_shadowAI(creature); } @@ -381,16 +381,16 @@ public: uint32 shadowshock_timer; uint32 shadowbuffet_timer; - void Reset() OVERRIDE + void Reset() override { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true); shadowshock_timer = 2500; shadowbuffet_timer = 5000; } - 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/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index e6c416a3b61..cd53b5c18c1 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -60,7 +60,7 @@ public: { boss_talon_king_ikissAI(Creature* creature) : BossAI(creature, DATA_TALON_KING_IKISS) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); ArcaneVolley_Timer = 5000; @@ -72,7 +72,7 @@ public: ManaShield = false; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!me->GetVictim() && me->CanCreatureAttack(who)) { @@ -94,25 +94,25 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - 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 { if (!UpdateVictim()) return; @@ -200,7 +200,7 @@ public: bool Intro; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetSethekkHallsAI<boss_talon_king_ikissAI>(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index d70cc5dd566..308e5e80105 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -38,7 +38,7 @@ class instance_sethekk_halls : public InstanceMapScript LoadDoorData(doorData); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { if (creature->GetEntry() == NPC_ANZU) { @@ -49,19 +49,19 @@ class instance_sethekk_halls : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { if (go->GetEntry() == GO_IKISS_DOOR) AddDoor(go, true); } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { if (go->GetEntry() == GO_IKISS_DOOR) AddDoor(go, false); } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -72,7 +72,7 @@ class instance_sethekk_halls : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -105,7 +105,7 @@ class instance_sethekk_halls : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_sethekk_halls_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index e0f25bb18e2..a48f5245273 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -65,7 +65,7 @@ class boss_ambassador_hellmaw : public CreatureScript _intro = false; } - void Reset() OVERRIDE + void Reset() override { if (!me->IsAlive()) return; @@ -81,7 +81,7 @@ class boss_ambassador_hellmaw : public CreatureScript DoAction(ACTION_AMBASSADOR_HELLMAW_BANISH); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasAura(SPELL_BANISH)) return; @@ -89,7 +89,7 @@ class boss_ambassador_hellmaw : public CreatureScript npc_escortAI::MoveInLineOfSight(who); } - void WaypointReached(uint32 /*waypointId*/) OVERRIDE + void WaypointReached(uint32 /*waypointId*/) override { } @@ -118,25 +118,25 @@ class boss_ambassador_hellmaw : public CreatureScript Start(true, false, 0, NULL, false, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _instance->SetBossState(DATA_AMBASSADOR_HELLMAW, IN_PROGRESS); Talk(SAY_AGGRO); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _instance->SetBossState(DATA_AMBASSADOR_HELLMAW, DONE); Talk(SAY_DEATH); } - void UpdateEscortAI(uint32 const diff) OVERRIDE + void UpdateEscortAI(uint32 const diff) override { if (!UpdateVictim()) return; @@ -181,7 +181,7 @@ class boss_ambassador_hellmaw : public CreatureScript bool _intro; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetShadowLabyrinthAI<boss_ambassador_hellmawAI>(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index d84181046de..2b7376a527b 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -64,12 +64,12 @@ class boss_blackheart_the_inciter : public CreatureScript { boss_blackheart_the_inciterAI(Creature* creature) : BossAI(creature, DATA_BLACKHEART_THE_INCITER) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_INCITE_CHAOS, 20000); @@ -79,19 +79,19 @@ class boss_blackheart_the_inciter : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -137,7 +137,7 @@ class boss_blackheart_the_inciter : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetShadowLabyrinthAI<boss_blackheart_the_inciterAI>(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index 2bdd86afe47..d454b646647 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -90,7 +90,7 @@ class boss_grandmaster_vorpil : public CreatureScript _intro = false; } - void Reset() OVERRIDE + void Reset() override { _Reset(); _helpYell = false; @@ -116,19 +116,19 @@ class boss_grandmaster_vorpil : public CreatureScript } } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, urand(7000, 14000)); @@ -141,7 +141,7 @@ class boss_grandmaster_vorpil : public CreatureScript SummonPortals(); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { BossAI::MoveInLineOfSight(who); @@ -152,7 +152,7 @@ class boss_grandmaster_vorpil : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -209,7 +209,7 @@ class boss_grandmaster_vorpil : public CreatureScript bool _helpYell; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetShadowLabyrinthAI<boss_grandmaster_vorpilAI>(creature); } @@ -227,15 +227,15 @@ class npc_voidtraveler : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _moveTimer = 0; _sacrificed = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_moveTimer <= diff) { @@ -270,7 +270,7 @@ class npc_voidtraveler : public CreatureScript bool _sacrificed; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetShadowLabyrinthAI<npc_voidtravelerAI>(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 130cdf31d42..31adf1522d4 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -64,7 +64,7 @@ class boss_murmur : public CreatureScript SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { _Reset(); events.ScheduleEvent(EVENT_SONIC_BOOM, 30000); @@ -84,17 +84,17 @@ class boss_murmur : public CreatureScript me->ResetPlayerDamageReq(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _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; @@ -167,7 +167,7 @@ class boss_murmur : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetShadowLabyrinthAI<boss_murmurAI>(creature); } @@ -183,7 +183,7 @@ class spell_murmur_sonic_boom : public SpellScriptLoader { PrepareSpellScript(spell_murmur_sonic_boom_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SONIC_BOOM_EFFECT)) return false; @@ -195,13 +195,13 @@ class spell_murmur_sonic_boom : public SpellScriptLoader GetCaster()->CastSpell((Unit*)NULL, SPELL_SONIC_BOOM_EFFECT, true); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_murmur_sonic_boom_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_murmur_sonic_boom_SpellScript(); } @@ -223,13 +223,13 @@ class spell_murmur_sonic_boom_effect : public SpellScriptLoader SetHitDamage(target->CountPctFromMaxHealth(80)); /// @todo: find correct value } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_murmur_sonic_boom_effect_SpellScript::CalcDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_murmur_sonic_boom_effect_SpellScript(); } @@ -265,13 +265,13 @@ class spell_murmur_thundering_storm : public SpellScriptLoader targets.remove_if(ThunderingStormCheck(GetCaster())); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_murmur_thundering_storm_SpellScript::FilterTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_murmur_thundering_storm_SpellScript(); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index 9e324d99879..4df80a0e15b 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -44,7 +44,7 @@ class instance_shadow_labyrinth : public InstanceMapScript FelOverseerCount = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -67,7 +67,7 @@ class instance_shadow_labyrinth : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -80,7 +80,7 @@ class instance_shadow_labyrinth : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -110,7 +110,7 @@ class instance_shadow_labyrinth : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -122,7 +122,7 @@ class instance_shadow_labyrinth : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -134,7 +134,7 @@ class instance_shadow_labyrinth : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -145,7 +145,7 @@ class instance_shadow_labyrinth : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -183,7 +183,7 @@ class instance_shadow_labyrinth : public InstanceMapScript uint32 FelOverseerCount; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_shadow_labyrinth_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index c45a1a4f391..427265e2562 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -65,7 +65,7 @@ public: { npc_spirit_of_olumAI(Creature* creature) : ScriptedAI(creature) { } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) override { if (action == 1) { @@ -76,7 +76,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_spirit_of_olumAI(creature); } @@ -98,22 +98,22 @@ public: instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { events.ScheduleEvent(EVENT_GET_CHANNELERS, 3000); enteredCombat = false; } - void JustDied(Unit* /*killer*/) OVERRIDE { } + void JustDied(Unit* /*killer*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_CLEAVE, 5000); events.ScheduleEvent(EVENT_IGNORED, 7000); enteredCombat = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!enteredCombat) @@ -205,7 +205,7 @@ public: bool enteredCombat; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_wrathbone_flayerAI>(creature); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index a6a16f83a26..1f8c090230b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -62,7 +62,7 @@ class boss_gurtogg_bloodboil : public CreatureScript public: boss_gurtogg_bloodboil() : CreatureScript("boss_gurtogg_bloodboil") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_gurtogg_bloodboilAI>(creature); } @@ -93,7 +93,7 @@ public: bool Phase1; - void Reset() OVERRIDE + void Reset() override { instance->SetBossState(DATA_GURTOGG_BLOODBOIL, NOT_STARTED); @@ -118,19 +118,19 @@ public: me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); Talk(SAY_AGGRO); instance->SetBossState(DATA_GURTOGG_BLOODBOIL, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetBossState(DATA_GURTOGG_BLOODBOIL, DONE); @@ -193,7 +193,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index b3d59c390c0..f0498d8a5c2 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -379,14 +379,14 @@ public: { flame_of_azzinothAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { FlameBlastTimer = 15000; CheckTimer = 5000; GlaiveGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } @@ -431,7 +431,7 @@ public: GlaiveGUID = guid; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -460,7 +460,7 @@ public: uint64 GlaiveGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new flame_of_azzinothAI(creature); } @@ -481,11 +481,11 @@ public: AkamaGUID = 0; } - void Reset() OVERRIDE; + void Reset() override; - void JustSummoned(Creature* summon) OVERRIDE; + void JustSummoned(Creature* summon) override; - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { if (summon->GetCreatureTemplate()->Entry == FLAME_OF_AZZINOTH) { @@ -502,7 +502,7 @@ public: Summons.Despawn(summon); } - void MovementInform(uint32 /*MovementType*/, uint32 /*Data*/) OVERRIDE + void MovementInform(uint32 /*MovementType*/, uint32 /*Data*/) override { if (FlightCount == 7) // change hover point { @@ -517,13 +517,13 @@ public: Timer[EVENT_FLIGHT_SEQUENCE] = 1000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { me->setActive(true); DoZoneInCombat(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who || Phase >= PHASE_TALK_SEQUENCE) return; @@ -534,10 +534,10 @@ public: ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit*) OVERRIDE { } + void MoveInLineOfSight(Unit*) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -547,7 +547,7 @@ public: instance->HandleGameObject(instance->GetData64(i), true); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -555,7 +555,7 @@ public: Talk(SAY_ILLIDAN_KILL); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (damage >= me->GetHealth() && done_by != me) damage = 0; @@ -563,7 +563,7 @@ public: done_by->AddThreat(me, -(3*(float)damage)/4); // do not let maiev tank him } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_GLAIVE_RETURNS) // Re-equip our warblades! { @@ -917,7 +917,7 @@ public: ++TransformCount; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if ((!UpdateVictim()) && Phase < PHASE_TALK_SEQUENCE) return; @@ -1121,7 +1121,7 @@ public: SummonList Summons; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_illidan_stormrageAI>(creature); } @@ -1139,7 +1139,7 @@ public: { boss_maievAI(Creature* creature) : ScriptedAI(creature) { }; - void Reset() OVERRIDE + void Reset() override { MaxTimer = 0; Phase = PHASE_NORMAL_MAIEV; @@ -1151,17 +1151,17 @@ public: me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, 45738); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterEvadeMode() OVERRIDE { } + void EnterEvadeMode() override { } void GetIllidanGUID(uint64 guid) { IllidanGUID = guid; } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetGUID() != IllidanGUID) damage = 0; @@ -1176,7 +1176,7 @@ public: } } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who || Timer[EVENT_MAIEV_STEALTH]) return; @@ -1194,7 +1194,7 @@ public: ScriptedAI::AttackStart(who); } - void DoAction(int32 param) OVERRIDE + void DoAction(int32 param) override { if (param > PHASE_ILLIDAN_NULL && param < PHASE_ILLIDAN_MAX) EnterPhase(PhaseIllidan(param)); @@ -1266,7 +1266,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if ((!UpdateVictim()) && !Timer[EVENT_MAIEV_STEALTH]) @@ -1343,7 +1343,7 @@ public: uint32 MaxTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_maievAI(creature); } @@ -1362,7 +1362,7 @@ public: JustCreated = true; } - void Reset() OVERRIDE + void Reset() override { WalkCount = 0; instance->SetBossState(DATA_ILLIDAN_STORMRAGE, NOT_STARTED); @@ -1408,24 +1408,24 @@ public: } // Do not call reset in Akama's evade mode, as this will stop him from summoning minions after he kills the first bit - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { me->RemoveAllAuras(); me->DeleteThreatList(); me->CombatStop(true); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void MovementInform(uint32 MovementType, uint32 /*Data*/) OVERRIDE + void MovementInform(uint32 MovementType, uint32 /*Data*/) override { if (MovementType == POINT_MOTION_TYPE) Timer = 1; } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (damage > me->GetHealth() || done_by->GetGUID() != IllidanGUID) damage = 0; @@ -1666,7 +1666,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsVisible()) { @@ -1749,7 +1749,7 @@ public: DoMeleeAttackIfReady(); } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override { player->CLOSE_GOSSIP_MENU(); EnterPhase(PHASE_CHANNEL); @@ -1772,7 +1772,7 @@ public: uint32 Check_Timer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_akama_illidanAI>(creature); } @@ -1957,7 +1957,7 @@ public: { cage_trap_triggerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { IllidanGUID = 0; @@ -1969,9 +1969,9 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!Active) @@ -1996,7 +1996,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (DespawnTimer) { @@ -2022,7 +2022,7 @@ public: bool SummonedBeams; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new cage_trap_triggerAI(creature); } @@ -2033,7 +2033,7 @@ class gameobject_cage_trap : public GameObjectScript public: gameobject_cage_trap() : GameObjectScript("gameobject_cage_trap") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { float x, y, z; player->GetPosition(x, y, z); @@ -2055,24 +2055,24 @@ public: { shadow_demonAI(Creature* creature) : ScriptedAI(creature) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void Reset() OVERRIDE + void Reset() override { TargetGUID = 0; DoCast(me, SPELL_SHADOW_DEMON_PASSIVE, true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Unit* target = Unit::GetUnit(*me, TargetGUID)) target->RemoveAurasDueToSpell(SPELL_PARALYZE); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim() || !me->GetVictim()) return; @@ -2096,7 +2096,7 @@ public: uint64 TargetGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new shadow_demonAI(creature); } @@ -2111,14 +2111,14 @@ public: { blade_of_azzinothAI(Creature* creature) : NullCreatureAI(creature) { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE) me->SetDisplayId(MODEL_BLADE);// appear when hit by Illidan's glaive } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new blade_of_azzinothAI(creature); } @@ -2137,7 +2137,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { IllidanGUID = instance->GetData64(DATA_ILLIDAN_STORMRAGE); @@ -2145,7 +2145,7 @@ public: DoCast(me, SPELL_SHADOWFIEND_PASSIVE, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } @@ -2166,7 +2166,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->GetVictim()) { @@ -2202,7 +2202,7 @@ public: uint32 CheckTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_parasitic_shadowfiendAI>(creature); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 7081607e755..ac91c2ac034 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -82,7 +82,7 @@ class boss_mother_shahraz : public CreatureScript public: boss_mother_shahraz() : CreatureScript("boss_mother_shahraz") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_shahrazAI>(creature); } @@ -111,7 +111,7 @@ public: bool Enraged; - void Reset() OVERRIDE + void Reset() override { instance->SetBossState(DATA_MOTHER_SHAHRAZ, NOT_STARTED); @@ -133,7 +133,7 @@ public: Enraged = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SetBossState(DATA_MOTHER_SHAHRAZ, IN_PROGRESS); @@ -141,12 +141,12 @@ 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 { instance->SetBossState(DATA_MOTHER_SHAHRAZ, DONE); @@ -171,7 +171,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index ed742a56ecd..39edb6b04aa 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -104,7 +104,7 @@ class npc_enslaved_soul : public CreatureScript public: npc_enslaved_soul() : CreatureScript("npc_enslaved_soul") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_enslaved_soulAI(creature); } @@ -115,15 +115,15 @@ public: uint64 ReliquaryGUID; - void Reset() OVERRIDE { ReliquaryGUID = 0; } + void Reset() override { ReliquaryGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, ENSLAVED_SOUL_PASSIVE, true); DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE; + void JustDied(Unit* /*killer*/) override; }; }; @@ -132,7 +132,7 @@ class boss_reliquary_of_souls : public CreatureScript public: boss_reliquary_of_souls() : CreatureScript("boss_reliquary_of_souls") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_reliquary_of_soulsAI>(creature); } @@ -156,7 +156,7 @@ public: uint32 SoulCount; uint32 SoulDeathCount; - void Reset() OVERRIDE + void Reset() override { instance->SetBossState(DATA_RELIQUARY_OF_SOULS, NOT_STARTED); @@ -175,7 +175,7 @@ public: me->RemoveAurasDueToSpell(SPELL_SUBMERGE); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who) return; @@ -192,7 +192,7 @@ public: AttackStartNoMove(who); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { me->AddThreat(who, 10000.0f); DoZoneInCombat(); @@ -239,12 +239,12 @@ public: } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetBossState(DATA_RELIQUARY_OF_SOULS, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Phase) return; @@ -389,7 +389,7 @@ class boss_essence_of_suffering : public CreatureScript public: boss_essence_of_suffering() : CreatureScript("boss_essence_of_suffering") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_essence_of_sufferingAI(creature); } @@ -406,7 +406,7 @@ public: uint32 SoulDrainTimer; uint32 AuraTimer; - void Reset() OVERRIDE + void Reset() override { StatAuraGUID = 0; @@ -417,7 +417,7 @@ public: AuraTimer = 5000; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { if (damage >= me->GetHealth()) { @@ -428,7 +428,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) { @@ -440,7 +440,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SUFF_SAY_SLAY); } @@ -469,7 +469,7 @@ public: me->AddThreat(target, 1000000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (me->IsInCombat()) { @@ -512,7 +512,7 @@ class boss_essence_of_desire : public CreatureScript public: boss_essence_of_desire() : CreatureScript("boss_essence_of_desire") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_essence_of_desireAI(creature); } @@ -525,7 +525,7 @@ public: uint32 DeadenTimer; uint32 SoulShockTimer; - void Reset() OVERRIDE + void Reset() override { RuneShieldTimer = 60000; DeadenTimer = 30000; @@ -533,7 +533,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_CONFUSE, true); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by == me) return; @@ -552,7 +552,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL)) for (uint8 i = 0; i < 3; ++i) @@ -562,19 +562,19 @@ public: me->InterruptSpell(CURRENT_GENERIC_SPELL, false); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(DESI_SAY_FREED); DoZoneInCombat(); DoCast(me, AURA_OF_DESIRE, true); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(DESI_SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -615,7 +615,7 @@ class boss_essence_of_anger : public CreatureScript public: boss_essence_of_anger() : CreatureScript("boss_essence_of_anger") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_essence_of_angerAI(creature); } @@ -634,7 +634,7 @@ public: bool CheckedAggro; - void Reset() OVERRIDE + void Reset() override { AggroTargetGUID = 0; @@ -647,7 +647,7 @@ public: CheckedAggro = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(ANGER_SAY_FREED); @@ -655,17 +655,17 @@ public: DoCast(me, AURA_OF_ANGER, true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(ANGER_SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(ANGER_SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim() || !me->GetVictim()) diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 48d1af27649..8e5eb5ca888 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -171,7 +171,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Reset() OVERRIDE + void Reset() override { if (!HasKilledAkamaAndReseting) { @@ -196,14 +196,14 @@ public: HasKilledAkamaAndReseting = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetBossState(DATA_SHADE_OF_AKAMA, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) { @@ -215,7 +215,7 @@ public: ScriptedAI::AttackStart(who); } - void SetData(uint32 data, uint32 value) OVERRIDE + void SetData(uint32 data, uint32 value) override { if (data == SETDATA_DATA && value == SETDATA_CHANNELER_DIED) me->RemoveAuraFromStack(SPELL_SHADE_SOUL_CHANNEL_2); @@ -223,7 +223,7 @@ public: UpdateSpeed(); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_AKAMA_SOUL_CHANNEL) { @@ -253,7 +253,7 @@ public: me->AddUnitState(UNIT_STATE_ROOT); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (HasKilledAkamaAndReseting) return; @@ -402,7 +402,7 @@ public: bool HasKilledAkamaAndReseting; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_shade_of_akamaAI>(creature); } @@ -424,7 +424,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { me->setFaction(FACTION_FRIENDLY); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -435,7 +435,7 @@ public: ShadeHasDied = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Shade = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SHADE_OF_AKAMA))) if (Shade->IsAlive()) @@ -444,7 +444,7 @@ public: me->GetMotionMaster()->MoveIdle(); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_THREAT && !StartCombat) { @@ -457,13 +457,13 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 2000); events.ScheduleEvent(EVENT_DESTRUCTIVE_POISON, 5000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (StartChannel) { @@ -524,7 +524,7 @@ public: DoMeleeAttackIfReady(); } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) override { if (action == 0) { @@ -544,7 +544,7 @@ public: }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_akamaAI>(creature); } @@ -566,7 +566,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); @@ -575,16 +575,16 @@ public: events.ScheduleEvent(EVENT_CHANNEL, 2000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Shade = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SHADE_OF_AKAMA))) Shade->AI()->SetData(SETDATA_DATA, SETDATA_CHANNELER_DIED); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -616,7 +616,7 @@ public: EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_ashtongue_channelerAI>(creature); } @@ -638,7 +638,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { Summons.DespawnAll(); @@ -649,12 +649,12 @@ public: leftSide = true; } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { Summons.Summon(summon); } - void SetData(uint32 data, uint32 value) OVERRIDE + void SetData(uint32 data, uint32 value) override { if (data == SETDATA_DATA) { @@ -687,7 +687,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (doSpawning) { @@ -724,7 +724,7 @@ public: bool doSpawning; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_creature_generator_akamaAI>(creature); } @@ -747,7 +747,7 @@ public: startedBanishing = false; } - void Reset() OVERRIDE + void Reset() override { if (!startedBanishing) { @@ -768,29 +768,29 @@ public: switchToCombat = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Shade = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SHADE_OF_AKAMA))) Shade->AI()->SetData(SETDATA_DATA, SETDATA_CHANNELER_DIED); me->DespawnOrUnsummon(5000); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!switchToCombat) return; ScriptedAI::AttackStart(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -846,7 +846,7 @@ public: bool switchToCombat; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_ashtongue_sorcererAI>(creature); } @@ -868,7 +868,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { summonerGuid = 0; @@ -876,18 +876,18 @@ public: AttackStart(target); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(5000); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_HEROIC_STRIKE, 5000); events.ScheduleEvent(EVENT_SHIELD_BASH, urand(10000, 16000)); @@ -895,7 +895,7 @@ public: events.ScheduleEvent(EVENT_WINDFURY, urand(8000, 12000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -936,7 +936,7 @@ public: uint64 summonerGuid; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_ashtongue_defenderAI>(creature); } @@ -958,7 +958,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { summonerGuid = 0; @@ -966,24 +966,24 @@ public: AttackStart(target); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(5000); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_DEBILITATING_POISON, urand(500, 2000)); events.ScheduleEvent(EVENT_EVISCERATE, urand(2000, 5000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1016,7 +1016,7 @@ public: uint64 summonerGuid; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_ashtongue_rogueAI>(creature); } @@ -1038,7 +1038,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { summonerGuid = 0; @@ -1046,24 +1046,24 @@ public: AttackStart(target); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(5000); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 18000); events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 6000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1096,7 +1096,7 @@ public: uint64 summonerGuid; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_ashtongue_elementalistAI>(creature); } @@ -1118,7 +1118,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { spiritMend = false; chainHeal = false; @@ -1128,23 +1128,23 @@ public: AttackStart(target); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(5000); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SPIRIT_HEAL, urand (5000, 6000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -1193,7 +1193,7 @@ public: bool chainHeal; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_ashtongue_spiritbinderAI>(creature); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 551213b8b2c..98a349f3606 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -63,7 +63,7 @@ class molten_flame : public CreatureScript public: molten_flame() : CreatureScript("molten_flame") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new molten_flameAI(creature); } @@ -72,7 +72,7 @@ public: { molten_flameAI(Creature* creature) : NullCreatureAI(creature) { } - void InitializeAI() OVERRIDE + void InitializeAI() override { float x, y, z; me->GetNearPoint(me, x, y, z, 1, 100, float(M_PI*2*rand_norm())); @@ -88,7 +88,7 @@ class boss_supremus : public CreatureScript public: boss_supremus() : CreatureScript("boss_supremus") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_supremusAI>(creature); } @@ -105,7 +105,7 @@ public: SummonList summons; uint32 phase; - void Reset() OVERRIDE + void Reset() override { if (me->IsAlive()) instance->SetBossState(DATA_SUPREMUS, NOT_STARTED); @@ -116,7 +116,7 @@ public: summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SetBossState(DATA_SUPREMUS, IN_PROGRESS); @@ -152,19 +152,19 @@ public: events.ScheduleEvent(EVENT_SWITCH_PHASE, 60000, GCD_CAST); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetBossState(DATA_SUPREMUS, DONE); summons.DespawnAll(); } - 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); } @@ -192,7 +192,7 @@ public: return target; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -256,7 +256,7 @@ class npc_volcano : public CreatureScript public: npc_volcano() : CreatureScript("npc_volcano") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_volcanoAI(creature); } @@ -268,7 +268,7 @@ public: SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -278,17 +278,17 @@ public: } uint32 wait; - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void DoAction(int32 /*info*/) OVERRIDE + void DoAction(int32 /*info*/) override { me->RemoveAura(SPELL_VOLCANIC_ERUPTION); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (wait <= diff)//wait 3secs before casting { diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index b95af29a43e..35521a783be 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -56,7 +56,7 @@ class npc_doom_blossom : public CreatureScript public: npc_doom_blossom() : CreatureScript("npc_doom_blossom") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_doom_blossomAI(creature); } @@ -69,16 +69,16 @@ public: uint32 ShadowBoltTimer; uint64 TeronGUID; - void Reset() OVERRIDE + void Reset() override { CheckTeronTimer = 5000; ShadowBoltTimer = 12000; TeronGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } void Despawn() @@ -87,7 +87,7 @@ public: me->RemoveCorpse(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CheckTeronTimer <= diff) { @@ -125,7 +125,7 @@ class npc_shadowy_construct : public CreatureScript public: npc_shadowy_construct() : CreatureScript("npc_shadowy_construct") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_shadowy_constructAI(creature); } @@ -140,7 +140,7 @@ public: uint32 CheckPlayerTimer; uint32 CheckTeronTimer; - void Reset() OVERRIDE + void Reset() override { GhostGUID = 0; TeronGUID = 0; @@ -149,9 +149,9 @@ public: CheckTeronTimer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || (!who->IsAlive()) || (who->GetGUID() == GhostGUID)) @@ -161,7 +161,7 @@ public: } /* Comment it out for now. NOTE TO FUTURE DEV: UNCOMMENT THIS OUT ONLY AFTER MIND CONTROL IS IMPLEMENTED - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetGUID() != GhostGUID) damage = 0; // Only the ghost can deal damage. @@ -190,7 +190,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CheckPlayerTimer <= diff) { @@ -215,7 +215,7 @@ class boss_teron_gorefiend : public CreatureScript public: boss_teron_gorefiend() : CreatureScript("boss_teron_gorefiend") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_teron_gorefiendAI>(creature); } @@ -244,7 +244,7 @@ public: bool Intro; bool Done; - void Reset() OVERRIDE + void Reset() override { instance->SetBossState(DATA_TERON_GOREFIEND, NOT_STARTED); @@ -265,9 +265,9 @@ public: Done = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!Intro && who->GetTypeId() == TYPEID_PLAYER && me->CanCreatureAttack(who)) @@ -288,12 +288,12 @@ 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 { instance->SetBossState(DATA_TERON_GOREFIEND, DONE); @@ -378,7 +378,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Intro && !Done) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 39fcbc16297..5228f891294 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -76,7 +76,7 @@ class boss_najentus : public CreatureScript public: boss_najentus() : CreatureScript("boss_najentus") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_najentusAI>(creature); } @@ -93,7 +93,7 @@ public: uint64 SpineTargetGUID; - void Reset() OVERRIDE + void Reset() override { events.Reset(); @@ -102,20 +102,20 @@ public: instance->SetBossState(DATA_HIGH_WARLORD_NAJENTUS, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); events.DelayEvents(5000, GCD_YELL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetBossState(DATA_HIGH_WARLORD_NAJENTUS, DONE); Talk(SAY_DEATH); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_HURL_SPINE && me->HasAura(SPELL_TIDAL_SHIELD)) { @@ -125,7 +125,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SetBossState(DATA_HIGH_WARLORD_NAJENTUS, IN_PROGRESS); @@ -155,7 +155,7 @@ public: events.RescheduleEvent(EVENT_SHIELD, 60000 + inc); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -222,7 +222,7 @@ class go_najentus_spine : public GameObjectScript public: go_najentus_spine() : GameObjectScript("go_najentus_spine") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (InstanceScript* instance = go->GetInstanceScript()) if (Creature* Najentus = ObjectAccessor::GetCreature(*go, instance->GetData64(DATA_HIGH_WARLORD_NAJENTUS))) diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 2db95b6ea53..4a4addd253e 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -120,7 +120,7 @@ class npc_blood_elf_council_voice_trigger : public CreatureScript public: npc_blood_elf_council_voice_trigger() : CreatureScript("npc_blood_elf_council_voice_trigger") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_blood_elf_council_voice_triggerAI(c); } @@ -142,7 +142,7 @@ public: bool EventStarted; - void Reset() OVERRIDE + void Reset() override { EnrageTimer = 900000; // 15 minutes AggroYellTimer = 500; @@ -164,13 +164,13 @@ public: } else TC_LOG_ERROR("scripts", ERROR_INST_DATA); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!EventStarted) return; @@ -216,7 +216,7 @@ class npc_illidari_council : public CreatureScript public: npc_illidari_council() : CreatureScript("npc_illidari_council") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_illidari_councilAI>(creature); } @@ -241,7 +241,7 @@ public: bool EventBegun; - void Reset() OVERRIDE + void Reset() override { CheckTimer = 2000; EndEventTimer = 0; @@ -274,9 +274,9 @@ public: me->SetDisplayId(11686); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } void StartEvent(Unit* target) @@ -311,7 +311,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!EventBegun) return; @@ -390,7 +390,7 @@ struct boss_illidari_councilAI : public ScriptedAI bool LoadedGUIDs; - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ILLIDARI_COUNCIL))) CAST_AI(npc_illidari_council::npc_illidari_councilAI, controller->AI())->StartEvent(who); @@ -403,7 +403,7 @@ struct boss_illidari_councilAI : public ScriptedAI LoadGUIDs(); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { for (uint8 i = 0; i < 4; ++i) { @@ -417,7 +417,7 @@ struct boss_illidari_councilAI : public ScriptedAI ScriptedAI::EnterEvadeMode(); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by == me) return; @@ -450,7 +450,7 @@ class boss_gathios_the_shatterer : public CreatureScript public: boss_gathios_the_shatterer() : CreatureScript("boss_gathios_the_shatterer") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_gathios_the_shattererAI>(creature); } @@ -465,7 +465,7 @@ public: uint32 AuraTimer; uint32 BlessingTimer; - void Reset() OVERRIDE + void Reset() override { ConsecrationTimer = 40000; HammerOfJusticeTimer = 10000; @@ -474,12 +474,12 @@ public: BlessingTimer = 60000; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_GATH_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_GATH_DEATH); } @@ -513,7 +513,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -582,7 +582,7 @@ class boss_high_nethermancer_zerevor : public CreatureScript public: boss_high_nethermancer_zerevor() : CreatureScript("boss_high_nethermancer_zerevor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_high_nethermancer_zerevorAI>(creature); } @@ -598,7 +598,7 @@ public: uint32 Cooldown; uint32 ArcaneExplosionTimer; - void Reset() OVERRIDE + void Reset() override { BlizzardTimer = urand(30, 91) * 1000; FlamestrikeTimer = urand(30, 91) * 1000; @@ -608,17 +608,17 @@ public: Cooldown = 0; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_ZERE_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_ZERE_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -686,7 +686,7 @@ class boss_lady_malande : public CreatureScript public: boss_lady_malande() : CreatureScript("boss_lady_malande") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_lady_malandeAI>(creature); } @@ -700,7 +700,7 @@ public: uint32 DivineWrathTimer; uint32 ReflectiveShieldTimer; - void Reset() OVERRIDE + void Reset() override { EmpoweredSmiteTimer = 38000; CircleOfHealingTimer = 20000; @@ -708,17 +708,17 @@ public: ReflectiveShieldTimer = 0; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_MALA_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_MALA_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -764,7 +764,7 @@ class boss_veras_darkshadow : public CreatureScript public: boss_veras_darkshadow() : CreatureScript("boss_veras_darkshadow") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_veras_darkshadowAI>(creature); } @@ -781,7 +781,7 @@ public: bool HasVanished; - void Reset() OVERRIDE + void Reset() override { EnvenomTargetGUID = 0; @@ -794,17 +794,17 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_VERA_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_VERA_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -878,7 +878,7 @@ public: { PrepareAuraScript(spell_boss_lady_malande_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { return sSpellMgr->GetSpellInfo(SPELL_REFLECTIVE_SHIELD_T); } @@ -892,13 +892,13 @@ public: target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_REFLECTIVE_SHIELD_T, &bp, NULL, NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { AfterEffectAbsorb += AuraEffectAbsorbFn(spell_boss_lady_malande_shield_AuraScript::Trigger, EFFECT_0); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_boss_lady_malande_shield_AuraScript(); } diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 91ee58ea286..5b91367a9c9 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -65,7 +65,7 @@ class instance_black_temple : public InstanceMapScript memset(IllidanDoorGUIDs, 0, 2 * sizeof(uint64)); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -110,7 +110,7 @@ class instance_black_temple : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -140,7 +140,7 @@ class instance_black_temple : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -161,7 +161,7 @@ class instance_black_temple : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -202,7 +202,7 @@ class instance_black_temple : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -213,7 +213,7 @@ class instance_black_temple : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -266,7 +266,7 @@ class instance_black_temple : public InstanceMapScript uint64 IllidanDoorGUIDs[2]; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_black_temple_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 3cb9ca26599..6d43b0e910c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -102,7 +102,7 @@ class boss_fathomlord_karathress : public CreatureScript public: boss_fathomlord_karathress() : CreatureScript("boss_fathomlord_karathress") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_fathomlord_karathressAI>(creature); } @@ -127,7 +127,7 @@ public: uint64 Advisors[MAX_ADVISORS]; - void Reset() OVERRIDE + void Reset() override { CataclysmicBolt_Timer = 10000; Enrage_Timer = 600000; //10 minutes @@ -191,12 +191,12 @@ public: instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); } - 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); @@ -206,12 +206,12 @@ public: me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { StartEvent(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance->GetData(DATA_KARATHRESSEVENT)) @@ -298,7 +298,7 @@ class boss_fathomguard_sharkkis : public CreatureScript public: boss_fathomguard_sharkkis() : CreatureScript("boss_fathomguard_sharkkis") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_fathomguard_sharkkisAI>(creature); } @@ -322,7 +322,7 @@ public: uint64 SummonedPet; - void Reset() OVERRIDE + void Reset() override { LeechingThrow_Timer = 20000; TheBeastWithin_Timer = 30000; @@ -340,19 +340,19 @@ public: instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Karathress = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KARATHRESS))) CAST_AI(boss_fathomlord_karathress::boss_fathomlord_karathressAI, Karathress->AI())->EventSharkkisDeath(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { instance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance->GetData(DATA_KARATHRESSEVENT)) @@ -437,7 +437,7 @@ class boss_fathomguard_tidalvess : public CreatureScript public: boss_fathomguard_tidalvess() : CreatureScript("boss_fathomguard_tidalvess") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_fathomguard_tidalvessAI>(creature); } @@ -456,7 +456,7 @@ public: uint32 PoisonCleansing_Timer; uint32 Earthbind_Timer; - void Reset() OVERRIDE + void Reset() override { FrostShock_Timer = 25000; Spitfire_Timer = 60000; @@ -466,20 +466,20 @@ public: instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Karathress = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KARATHRESS))) CAST_AI(boss_fathomlord_karathress::boss_fathomlord_karathressAI, Karathress->AI())->EventTidalvessDeath(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { instance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); DoCast(me, SPELL_WINDFURY_WEAPON); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance->GetData(DATA_KARATHRESSEVENT)) @@ -553,7 +553,7 @@ class boss_fathomguard_caribdis : public CreatureScript public: boss_fathomguard_caribdis() : CreatureScript("boss_fathomguard_caribdis") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_fathomguard_caribdisAI>(creature); } @@ -572,7 +572,7 @@ public: uint32 Heal_Timer; uint32 Cyclone_Timer; - void Reset() OVERRIDE + void Reset() override { WaterBoltVolley_Timer = 35000; TidalSurge_Timer = 15000+rand()%5000; @@ -582,19 +582,19 @@ public: instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Karathress = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KARATHRESS))) CAST_AI(boss_fathomlord_karathress::boss_fathomlord_karathressAI, Karathress->AI())->EventCaribdisDeath(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { instance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance->GetData(DATA_KARATHRESSEVENT)) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 56055d8a5b4..c4d21d30328 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -84,7 +84,7 @@ class boss_hydross_the_unstable : public CreatureScript public: boss_hydross_the_unstable() : CreatureScript("boss_hydross_the_unstable") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_hydross_the_unstableAI>(creature); } @@ -113,7 +113,7 @@ public: bool beam; SummonList Summons; - void Reset() OVERRIDE + void Reset() override { DeSummonBeams(); beams[0] = 0; @@ -169,19 +169,19 @@ public: } } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(CorruptedForm ? SAY_CORRUPT_SLAY : SAY_CLEAN_SLAY); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == ENTRY_PURE_SPAWN) { @@ -197,12 +197,12 @@ public: } } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { Summons.Despawn(summon); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(CorruptedForm ? SAY_CORRUPT_DEATH : SAY_CLEAN_DEATH); @@ -210,7 +210,7 @@ public: Summons.DespawnAll(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!beam) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 8d6eb064194..dbf0c419fad 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -138,7 +138,7 @@ class boss_lady_vashj : public CreatureScript public: boss_lady_vashj() : CreatureScript("boss_lady_vashj") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_lady_vashjAI>(creature); } @@ -179,7 +179,7 @@ public: bool CanAttack; bool JustCreated; - void Reset() OVERRIDE + void Reset() override { AggroTimer = 19000; ShockBlastTimer = 1+rand()%60000; @@ -227,12 +227,12 @@ public: if (TaintedElementalTimer > 50000) TaintedElementalTimer = 50000; } - 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); @@ -248,7 +248,7 @@ public: instance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { // remove old tainted cores to prevent cheating in phase 2 Map* map = me->GetMap(); @@ -262,7 +262,7 @@ public: AttackStart(who); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!Intro) @@ -310,7 +310,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!CanAttack && Intro) { @@ -548,7 +548,7 @@ class npc_enchanted_elemental : public CreatureScript public: npc_enchanted_elemental() : CreatureScript("npc_enchanted_elemental") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_enchanted_elementalAI>(creature); } @@ -567,7 +567,7 @@ public: uint64 VashjGUID; - void Reset() OVERRIDE + void Reset() override { me->SetSpeed(MOVE_WALK, 0.6f); // walk me->SetSpeed(MOVE_RUN, 0.6f); // run @@ -592,12 +592,12 @@ public: VashjGUID = instance->GetData64(DATA_LADYVASHJ); } - 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 { if (!VashjGUID) return; @@ -637,7 +637,7 @@ class npc_tainted_elemental : public CreatureScript public: npc_tainted_elemental() : CreatureScript("npc_tainted_elemental") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_tainted_elementalAI>(creature); } @@ -654,24 +654,24 @@ public: uint32 PoisonBoltTimer; uint32 DespawnTimer; - void Reset() OVERRIDE + void Reset() override { PoisonBoltTimer = 5000+rand()%5000; DespawnTimer = 30000; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* vashj = Unit::GetCreature((*me), instance->GetData64(DATA_LADYVASHJ))) CAST_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->EventTaintedElementalDeath(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { me->AddThreat(who, 0.1f); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // PoisonBoltTimer if (PoisonBoltTimer <= diff) @@ -705,7 +705,7 @@ class npc_toxic_sporebat : public CreatureScript public: npc_toxic_sporebat() : CreatureScript("npc_toxic_sporebat") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_toxic_sporebatAI>(creature); } @@ -725,7 +725,7 @@ public: uint32 BoltTimer; uint32 CheckTimer; - void Reset() OVERRIDE + void Reset() override { me->SetDisableGravity(true); me->setFaction(14); @@ -735,12 +735,12 @@ public: CheckTimer = 1000; } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + void MoveInLineOfSight(Unit* /*who*/) override { } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -749,7 +749,7 @@ public: MovementTimer = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // Random movement if (MovementTimer <= diff) @@ -801,7 +801,7 @@ class npc_shield_generator_channel : public CreatureScript public: npc_shield_generator_channel() : CreatureScript("npc_shield_generator_channel") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_shield_generator_channelAI>(creature); } @@ -817,7 +817,7 @@ public: uint32 CheckTimer; bool Cast; - void Reset() OVERRIDE + void Reset() override { CheckTimer = 0; Cast = false; @@ -826,10 +826,10 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CheckTimer <= diff) { @@ -856,7 +856,7 @@ class item_tainted_core : public ItemScript public: item_tainted_core() : ItemScript("item_tainted_core") { } - bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& targets) OVERRIDE + bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& targets) override { InstanceScript* instance = player->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 4df431b91ac..462babdc597 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -74,7 +74,7 @@ class npc_inner_demon : public CreatureScript public: npc_inner_demon() : CreatureScript("npc_inner_demon") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_inner_demonAI(creature); } @@ -91,33 +91,33 @@ public: uint32 Link_Timer; uint64 victimGUID; - void Reset() OVERRIDE + void Reset() override { ShadowBolt_Timer = 10000; Link_Timer = 1000; } - void SetGUID(uint64 guid, int32 id/* = 0 */) OVERRIDE + void SetGUID(uint64 guid, int32 id/* = 0 */) override { if (id == INNER_DEMON_VICTIM) victimGUID = guid; } - uint64 GetGUID(int32 id/* = 0 */) const OVERRIDE + uint64 GetGUID(int32 id/* = 0 */) const override { if (id == INNER_DEMON_VICTIM) return victimGUID; return 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Unit* unit = Unit::GetUnit(*me, victimGUID); if (unit && unit->HasAura(SPELL_INSIDIOUS_WHISPER)) unit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetGUID() != victimGUID && done_by->GetGUID() != me->GetGUID()) { @@ -126,13 +126,13 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (!victimGUID) return; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim() || !me->GetVictim()) @@ -179,7 +179,7 @@ class boss_leotheras_the_blind : public CreatureScript public: boss_leotheras_the_blind() : CreatureScript("boss_leotheras_the_blind") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_leotheras_the_blindAI>(creature); } @@ -218,7 +218,7 @@ public: uint64 Demon; uint64 SpellBinderGUID[3]; - void Reset() OVERRIDE + void Reset() override { CheckChannelers(); BanishTimer = 1000; @@ -263,7 +263,7 @@ public: SpellBinderGUID[i] = binder->GetGUID(); } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasAura(AURA_BANISH)) @@ -382,7 +382,7 @@ public: } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -390,7 +390,7 @@ public: Talk(DemonForm ? SAY_DEMON_SLAY : SAY_NIGHTELF_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -403,7 +403,7 @@ public: instance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (me->HasAura(AURA_BANISH)) return; @@ -411,7 +411,7 @@ public: me->LoadEquipment(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (me->HasAura(AURA_BANISH) || !UpdateVictim()) @@ -599,7 +599,7 @@ class boss_leotheras_the_blind_demonform : public CreatureScript public: boss_leotheras_the_blind_demonform() : CreatureScript("boss_leotheras_the_blind_demonform") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_leotheras_the_blind_demonformAI(creature); } @@ -611,7 +611,7 @@ public: uint32 ChaosBlast_Timer; bool DealDamage; - void Reset() OVERRIDE + void Reset() override { ChaosBlast_Timer = 1000; DealDamage = true; @@ -622,7 +622,7 @@ public: Talk(SAY_FREE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -630,18 +630,18 @@ public: Talk(SAY_DEMON_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { //invisibility (blizzlike, at the end of the fight he doesn't die, he disappears) DoCast(me, 8149, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { StartEvent(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -672,7 +672,7 @@ class npc_greyheart_spellbinder : public CreatureScript public: npc_greyheart_spellbinder() : CreatureScript("npc_greyheart_spellbinder") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_greyheart_spellbinderAI>(creature); } @@ -695,7 +695,7 @@ public: bool AddedBanish; - void Reset() OVERRIDE + void Reset() override { Mindblast_Timer = urand(3000, 8000); Earthshock_Timer = urand(5000, 10000); @@ -706,13 +706,13 @@ public: CAST_AI(boss_leotheras_the_blind::boss_leotheras_the_blindAI, leotheras->AI())->CheckChannelers(/*false*/); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { me->InterruptNonMeleeSpells(false); instance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, who->GetGUID()); } - void JustRespawned() OVERRIDE + void JustRespawned() override { AddedBanish = false; Reset(); @@ -731,7 +731,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!leotherasGUID) leotherasGUID = instance->GetData64(DATA_LEOTHERAS); @@ -791,7 +791,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE { } + void JustDied(Unit* /*killer*/) override { } }; }; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 718c32cd8ae..1f58573465f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -79,7 +79,7 @@ class boss_the_lurker_below : public CreatureScript public: boss_the_lurker_below() : CreatureScript("boss_the_lurker_below") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_the_lurker_belowAI>(creature); } @@ -117,7 +117,7 @@ public: return true; } - void Reset() OVERRIDE + void Reset() override { me->SetSwim(true); me->SetDisableGravity(true); @@ -147,7 +147,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetData(DATA_THELURKERBELOWEVENT, DONE); instance->SetData(DATA_STRANGE_POOL, IN_PROGRESS); @@ -155,12 +155,12 @@ public: Summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!CanStartEvent) // boss is invisible, don't attack @@ -173,13 +173,13 @@ public: } } - void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE + void MovementInform(uint32 type, uint32 /*id*/) override { if (type == ROTATE_MOTION_TYPE) me->SetReactState(REACT_AGGRESSIVE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!CanStartEvent) // boss is invisible, don't attack { @@ -365,7 +365,7 @@ class npc_coilfang_ambusher : public CreatureScript public: npc_coilfang_ambusher() : CreatureScript("npc_coilfang_ambusher") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_coilfang_ambusherAI(creature); } @@ -380,13 +380,13 @@ public: uint32 MultiShotTimer; uint32 ShootBowTimer; - void Reset() OVERRIDE + void Reset() override { MultiShotTimer = 10000; ShootBowTimer = 4000; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || me->GetVictim()) @@ -396,7 +396,7 @@ public: AttackStart(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (MultiShotTimer <= diff) { @@ -425,7 +425,7 @@ class go_strange_pool : public GameObjectScript public: go_strange_pool() : GameObjectScript("go_strange_pool") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { // 25% if (InstanceScript* instanceScript = go->GetInstanceScript()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 77fd36f2f5e..75d2026537e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -89,7 +89,7 @@ class boss_morogrim_tidewalker : public CreatureScript public: boss_morogrim_tidewalker() : CreatureScript("boss_morogrim_tidewalker") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_morogrim_tidewalkerAI>(creature); } @@ -116,7 +116,7 @@ public: bool Earthquake; bool Phase2; - void Reset() OVERRIDE + void Reset() override { TidalWave_Timer = 10000; WateryGrave_Timer = 30000; @@ -140,19 +140,19 @@ public: instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); } - 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(DATA_MOROGRIMTIDEWALKEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { PlayerList = &me->GetMap()->GetPlayers(); Playercount = PlayerList->getSize(); @@ -170,7 +170,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -289,7 +289,7 @@ class npc_water_globule : public CreatureScript public: npc_water_globule() : CreatureScript("npc_water_globule") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_water_globuleAI(creature); } @@ -300,7 +300,7 @@ public: uint32 Check_Timer; - void Reset() OVERRIDE + void Reset() override { Check_Timer = 1000; @@ -309,9 +309,9 @@ public: me->setFaction(14); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || me->GetVictim()) @@ -325,7 +325,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 528726723ed..bc557d97ef5 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -64,7 +64,7 @@ class go_bridge_console : public GameObjectScript public: go_bridge_console() : GameObjectScript("go_bridge_console") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); @@ -89,7 +89,7 @@ class instance_serpent_shrine : public InstanceMapScript { } - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -122,7 +122,7 @@ class instance_serpent_shrine : public InstanceMapScript } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -131,7 +131,7 @@ class instance_serpent_shrine : public InstanceMapScript return false; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { //Water checks if (WaterCheckTimer <= diff) @@ -191,7 +191,7 @@ class instance_serpent_shrine : public InstanceMapScript FrenzySpawnTimer -= diff; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -216,7 +216,7 @@ class instance_serpent_shrine : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -246,7 +246,7 @@ class instance_serpent_shrine : public InstanceMapScript } } - void SetData64(uint32 type, uint64 data) OVERRIDE + void SetData64(uint32 type, uint64 data) override { if (type == DATA_KARATHRESSEVENT_STARTER) KarathressEvent_Starter = data; @@ -254,7 +254,7 @@ class instance_serpent_shrine : public InstanceMapScript LeotherasEventStarter = data; } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -282,7 +282,7 @@ class instance_serpent_shrine : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -352,7 +352,7 @@ class instance_serpent_shrine : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -392,7 +392,7 @@ class instance_serpent_shrine : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; std::ostringstream stream; @@ -402,7 +402,7 @@ class instance_serpent_shrine : public InstanceMapScript return stream.str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -447,7 +447,7 @@ class instance_serpent_shrine : public InstanceMapScript bool DoSpawnFrenzy; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_serpentshrine_cavern_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 70b36e31713..848e9140f25 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -39,7 +39,7 @@ class boss_hydromancer_thespia : public CreatureScript public: boss_hydromancer_thespia() : CreatureScript("boss_hydromancer_thespia") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_thespiaAI>(creature); } @@ -57,7 +57,7 @@ public: uint32 LungBurst_Timer; uint32 EnvelopingWinds_Timer; - void Reset() OVERRIDE + void Reset() override { LightningCloud_Timer = 15000; LungBurst_Timer = 7000; @@ -66,26 +66,26 @@ public: instance->SetBossState(DATA_HYDROMANCER_THESPIA, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEAD); instance->SetBossState(DATA_HYDROMANCER_THESPIA, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetBossState(DATA_HYDROMANCER_THESPIA, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -136,7 +136,7 @@ class npc_coilfang_waterelemental : public CreatureScript public: npc_coilfang_waterelemental() : CreatureScript("npc_coilfang_waterelemental") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_coilfang_waterelementalAI(creature); } @@ -147,14 +147,14 @@ public: uint32 WaterBoltVolley_Timer; - void Reset() OVERRIDE + void Reset() override { WaterBoltVolley_Timer = 3000+rand()%3000; } - 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/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 3661ebc8cc3..5dbc6a91418 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -55,7 +55,7 @@ class boss_mekgineer_steamrigger : public CreatureScript public: boss_mekgineer_steamrigger() : CreatureScript("boss_mekgineer_steamrigger") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_mekgineer_steamriggerAI>(creature); } @@ -76,7 +76,7 @@ public: bool Summon50; bool Summon25; - void Reset() OVERRIDE + void Reset() override { Shrink_Timer = 20000; Saw_Blade_Timer = 15000; @@ -89,19 +89,19 @@ public: instance->SetBossState(DATA_MEKGINEER_STEAMRIGGER, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetBossState(DATA_MEKGINEER_STEAMRIGGER, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -123,7 +123,7 @@ public: DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -192,7 +192,7 @@ class npc_steamrigger_mechanic : public CreatureScript public: npc_steamrigger_mechanic() : CreatureScript("npc_steamrigger_mechanic") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_steamrigger_mechanicAI>(creature); } @@ -208,19 +208,19 @@ public: uint32 Repair_Timer; - void Reset() OVERRIDE + void Reset() override { Repair_Timer = 2000; } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + void MoveInLineOfSight(Unit* /*who*/) override { //react only if attacked } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Repair_Timer <= diff) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index fe035fc1dec..536ea77a98b 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -48,7 +48,7 @@ class npc_naga_distiller : public CreatureScript public: npc_naga_distiller() : CreatureScript("npc_naga_distiller") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_naga_distillerAI>(creature); } @@ -62,7 +62,7 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -75,7 +75,7 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void StartRageGen(Unit* /*caster*/) { @@ -87,7 +87,7 @@ public: instance->SetData(DATA_DISTILLER, IN_PROGRESS); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { if (me->GetHealth() <= damage) instance->SetData(DATA_DISTILLER, DONE); @@ -101,7 +101,7 @@ class boss_warlord_kalithresh : public CreatureScript public: boss_warlord_kalithresh() : CreatureScript("boss_warlord_kalithresh") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_warlord_kalithreshAI>(creature); } @@ -120,7 +120,7 @@ public: uint32 Rage_Timer; bool CanRage; - void Reset() OVERRIDE + void Reset() override { Reflection_Timer = 10000; Impale_Timer = 7000+rand()%7000; @@ -130,19 +130,19 @@ public: instance->SetBossState(DATA_WARLORD_KALITHRESH, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetBossState(DATA_WARLORD_KALITHRESH, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { //hack :( if (spell->Id == SPELL_WARLORDS_RAGE_PROC) @@ -150,14 +150,14 @@ public: me->RemoveAurasDueToSpell(SPELL_WARLORDS_RAGE_PROC); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetBossState(DATA_WARLORD_KALITHRESH, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index bd2d4d5f416..19e8c5187ba 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -24,7 +24,7 @@ class go_main_chambers_access_panel : public GameObjectScript public: go_main_chambers_access_panel() : GameObjectScript("go_main_chambers_access_panel") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); if (!instance) @@ -65,7 +65,7 @@ class instance_steam_vault : public InstanceMapScript DistillerState = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -83,7 +83,7 @@ class instance_steam_vault : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -95,7 +95,7 @@ class instance_steam_vault : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -111,20 +111,20 @@ class instance_steam_vault : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type == DATA_DISTILLER) DistillerState = data; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_DISTILLER) return DistillerState; return 0; } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -156,7 +156,7 @@ class instance_steam_vault : public InstanceMapScript return true; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -167,7 +167,7 @@ class instance_steam_vault : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -208,7 +208,7 @@ class instance_steam_vault : public InstanceMapScript uint8 DistillerState; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_steam_vault_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp index 7243b6e6738..1037f92cc42 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp @@ -60,18 +60,18 @@ class boss_mennu_the_betrayer : public CreatureScript { boss_mennu_the_betrayerAI(Creature* creature) : BossAI(creature, DATA_MENNU_THE_BETRAYER) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30000); @@ -82,12 +82,12 @@ class boss_mennu_the_betrayer : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -129,7 +129,7 @@ class boss_mennu_the_betrayer : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_mennu_the_betrayerAI(creature); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp index 856e90405cb..a71c9660623 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp @@ -51,17 +51,17 @@ class boss_quagmirran : public CreatureScript { boss_quagmirranAI(Creature* creature) : BossAI(creature, DATA_QUAGMIRRAN) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_ACID_SPRAY, 25000); @@ -70,9 +70,9 @@ class boss_quagmirran : public CreatureScript events.ScheduleEvent(EVENT_POISON_BOLT_VOLLEY, 31000); } - void KilledUnit(Unit* /*victim*/) OVERRIDE { } + void KilledUnit(Unit* /*victim*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -112,7 +112,7 @@ class boss_quagmirran : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_quagmirranAI(creature); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp index a819b59d359..6fb41f2eab5 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp @@ -50,18 +50,18 @@ class boss_rokmar_the_crackler : public CreatureScript { boss_rokmar_the_cracklerAI(Creature* creature) : BossAI(creature, DATA_MENNU_THE_BETRAYER) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); rokmarFrenzy = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 10000); @@ -69,9 +69,9 @@ class boss_rokmar_the_crackler : public CreatureScript events.ScheduleEvent(EVENT_WATER_SPIT, 14000); } - void KilledUnit(Unit* /*victim*/) OVERRIDE { } + void KilledUnit(Unit* /*victim*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -115,7 +115,7 @@ class boss_rokmar_the_crackler : public CreatureScript bool rokmarFrenzy; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_rokmar_the_cracklerAI(creature); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp index e942d0987fc..b6860d3e74c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp @@ -31,7 +31,7 @@ class instance_the_slave_pens : public InstanceMapScript public: instance_the_slave_pens() : InstanceMapScript(SPScriptName, 547) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_the_slave_pens_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp index 1ea58bce0ca..ae7d5fd2308 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp @@ -41,7 +41,7 @@ class boss_hungarfen : public CreatureScript public: boss_hungarfen() : CreatureScript("boss_hungarfen") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_hungarfenAI(creature); } @@ -56,18 +56,18 @@ public: uint32 Mushroom_Timer; uint32 AcidGeyser_Timer; - void Reset() OVERRIDE + void Reset() override { Root = false; Mushroom_Timer = 5000; // 1 mushroom after 5s, then one per 10s. This should be different in heroic mode AcidGeyser_Timer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -109,7 +109,7 @@ class npc_underbog_mushroom : public CreatureScript public: npc_underbog_mushroom() : CreatureScript("npc_underbog_mushroom") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_underbog_mushroomAI(creature); } @@ -122,7 +122,7 @@ public: uint32 Grow_Timer; uint32 Shrink_Timer; - void Reset() OVERRIDE + void Reset() override { Stop = false; Grow_Timer = 0; @@ -132,14 +132,14 @@ public: DoCast(me, SPELL_SPORE_CLOUD, true); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Stop) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp index 13ebf22436c..4f8c9390ba4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp @@ -47,7 +47,7 @@ class boss_the_black_stalker : public CreatureScript public: boss_the_black_stalker() : CreatureScript("boss_the_black_stalker") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_the_black_stalkerAI(creature); } @@ -68,7 +68,7 @@ public: uint32 check_Timer; std::list<uint64> Striders; - void Reset() OVERRIDE + void Reset() override { Levitate_Timer = 12000; ChainLightning_Timer = 6000; @@ -80,9 +80,9 @@ public: Striders.clear(); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER) { @@ -95,14 +95,14 @@ public: } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { for (std::list<uint64>::const_iterator i = Striders.begin(); i != Striders.end(); ++i) if (Creature* strider = Unit::GetCreature(*me, *i)) strider->DisappearAndDie(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp index 9249cadbe49..f950a61133e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp @@ -30,7 +30,7 @@ class instance_the_underbog : public InstanceMapScript public: instance_the_underbog() : InstanceMapScript("instance_the_underbog", 546) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_the_underbog_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 917dda1389a..592ffc1f69e 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -83,7 +83,7 @@ class boss_gruul : public CreatureScript bool m_bPerformingGroundSlam; - void Reset() OVERRIDE + void Reset() override { _Reset(); m_uiGrowth_Timer= 30000; @@ -95,25 +95,25 @@ class boss_gruul : public CreatureScript m_uiReverberation_Timer= 60000+45000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void SpellHitTarget(Unit* target, const SpellInfo* pSpell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* pSpell) override { //This to emulate effect1 (77) of SPELL_GROUND_SLAM, knock back to any direction //It's initially wrong, since this will cause fall damage, which is by comments, not intended. @@ -153,7 +153,7 @@ class boss_gruul : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -250,7 +250,7 @@ class boss_gruul : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI<boss_gruulAI>(creature); } @@ -265,7 +265,7 @@ class spell_gruul_shatter : public SpellScriptLoader { PrepareSpellScript(spell_gruul_shatter_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_STONED)) return false; @@ -283,13 +283,13 @@ class spell_gruul_shatter : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gruul_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gruul_shatter_SpellScript(); } @@ -318,13 +318,13 @@ class spell_gruul_shatter_effect : public SpellScriptLoader SetHitDamage(int32(GetHitDamage() * ((radius - distance) / radius))); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_gruul_shatter_effect_SpellScript::CalculateDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gruul_shatter_effect_SpellScript(); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index f14e6badc35..c1e9d0a2b91 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -90,7 +90,7 @@ public: bool Phase2; - void Reset() OVERRIDE + void Reset() override { ArcingSmash_Timer = 10000; MightyBlow_Timer = 40000; @@ -105,12 +105,12 @@ public: instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - 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); @@ -123,14 +123,14 @@ public: Talk(SAY_OGRE_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -194,7 +194,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI<boss_high_king_maulgarAI>(creature); } @@ -218,7 +218,7 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { DarkDecay_Timer = 10000; Summon_Timer = 15000; @@ -227,7 +227,7 @@ public: instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -242,13 +242,13 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* maulgar = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MAULGAR))) maulgar->AI()->DoAction(ACTION_ADD_DEATH); @@ -256,7 +256,7 @@ public: instance->SetBossState(DATA_MAULGAR, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -289,7 +289,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI<boss_olm_the_summonerAI>(creature); } @@ -315,7 +315,7 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { GreaterPolymorph_Timer = 5000; LightningBolt_Timer = 10000; @@ -325,13 +325,13 @@ public: instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* maulgar = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MAULGAR))) maulgar->AI()->DoAction(ACTION_ADD_DEATH); @@ -339,7 +339,7 @@ public: instance->SetBossState(DATA_MAULGAR, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -378,7 +378,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI<boss_kiggler_the_crazedAI>(creature); } @@ -402,7 +402,7 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { GreaterPowerWordShield_Timer = 5000; Heal_Timer = urand(25000, 40000); @@ -411,13 +411,13 @@ public: instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* maulgar = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MAULGAR))) maulgar->AI()->DoAction(ACTION_ADD_DEATH); @@ -425,7 +425,7 @@ public: instance->SetBossState(DATA_MAULGAR, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -455,7 +455,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI<boss_blindeye_the_seerAI>(creature); } @@ -479,7 +479,7 @@ public: InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { GreaterFireball_Timer = 1000; SpellShield_Timer = 5000; @@ -488,13 +488,13 @@ public: instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* maulgar = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MAULGAR))) maulgar->AI()->DoAction(ACTION_ADD_DEATH); @@ -502,7 +502,7 @@ public: instance->SetBossState(DATA_MAULGAR, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -546,7 +546,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI<boss_krosh_firehandAI>(creature); } diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index caba33e1513..ae3971a943e 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -51,7 +51,7 @@ class instance_gruuls_lair : public InstanceMapScript MaulgarGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -69,7 +69,7 @@ class instance_gruuls_lair : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) OVERRIDE + void OnCreatureRemove(Creature* creature) override { switch (creature->GetEntry()) { @@ -85,7 +85,7 @@ class instance_gruuls_lair : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -98,7 +98,7 @@ class instance_gruuls_lair : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -111,7 +111,7 @@ class instance_gruuls_lair : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -123,7 +123,7 @@ class instance_gruuls_lair : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -134,7 +134,7 @@ class instance_gruuls_lair : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -170,7 +170,7 @@ class instance_gruuls_lair : public InstanceMapScript uint64 MaulgarGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_gruuls_lair_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index f610d6dd7e0..063a30ca875 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -57,7 +57,7 @@ class boss_broggok : public CreatureScript uint32 PoisonBolt_Timer; bool canAttack; - void Reset() OVERRIDE + void Reset() override { _Reset(); AcidSpray_Timer = 10000; @@ -66,13 +66,13 @@ class boss_broggok : public CreatureScript DoAction(ACTION_RESET_BROGGOK); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -107,12 +107,12 @@ class boss_broggok : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -134,7 +134,7 @@ class boss_broggok : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetBloodFurnaceAI<boss_broggokAI>(creature); } @@ -153,15 +153,15 @@ class npc_broggok_poison_cloud : public CreatureScript creature->SetReactState(REACT_PASSIVE); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { DoCast(me, SPELL_POISON_CLOUD_PASSIVE, true); } - 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_broggok_poison_cloudAI(creature); } @@ -172,7 +172,7 @@ class go_broggok_lever : public GameObjectScript public: go_broggok_lever() : GameObjectScript("go_broggok_lever") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { if (InstanceScript* instance = go->GetInstanceScript()) if (instance->GetBossState(DATA_BROGGOK) != DONE && instance->GetBossState(DATA_BROGGOK) != IN_PROGRESS) @@ -197,7 +197,7 @@ class spell_broggok_poison_cloud : public SpellScriptLoader { PrepareAuraScript(spell_broggok_poison_cloud_AuraScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { if (!sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].TriggerSpell)) return false; @@ -213,13 +213,13 @@ class spell_broggok_poison_cloud : public SpellScriptLoader GetTarget()->CastCustomSpell(triggerSpell, SPELLVALUE_RADIUS_MOD, mod, (Unit*)NULL, TRIGGERED_FULL_MASK, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_broggok_poison_cloud_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_broggok_poison_cloud_AuraScript(); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index e9a8a68b116..066772cb0f7 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -78,7 +78,7 @@ class boss_kelidan_the_breaker : public CreatureScript bool addYell; uint64 Channelers[5]; - void Reset() OVERRIDE + void Reset() override { _Reset(); ShadowVolley_Timer = 1000; @@ -92,7 +92,7 @@ class boss_kelidan_the_breaker : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { _EnterCombat(); Talk(SAY_WAKE); @@ -101,7 +101,7 @@ class boss_kelidan_the_breaker : public CreatureScript DoStartMovement(who); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (rand()%2) return; @@ -168,13 +168,13 @@ class boss_kelidan_the_breaker : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DIE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -246,7 +246,7 @@ class boss_kelidan_the_breaker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetBloodFurnaceAI<boss_kelidan_the_breakerAI>(creature); } @@ -279,7 +279,7 @@ class npc_shadowmoon_channeler : public CreatureScript uint32 MarkOfShadow_Timer; uint32 check_Timer; - void Reset() OVERRIDE + void Reset() override { ShadowBolt_Timer = 1000+rand()%1000; MarkOfShadow_Timer = 5000+rand()%2000; @@ -288,7 +288,7 @@ class npc_shadowmoon_channeler : public CreatureScript me->InterruptNonMeleeSpells(true); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerEngaged(who); @@ -297,13 +297,13 @@ class npc_shadowmoon_channeler : public CreatureScript DoStartMovement(who); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(killer); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -344,7 +344,7 @@ class npc_shadowmoon_channeler : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetBloodFurnaceAI<npc_shadowmoon_channelerAI>(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 6ab356bfa4a..a24abac44d6 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -56,7 +56,7 @@ class boss_the_maker : public CreatureScript uint32 Domination_Timer; uint32 Knockdown_Timer; - void Reset() OVERRIDE + void Reset() override { _Reset(); AcidSpray_Timer = 15000; @@ -65,25 +65,25 @@ class boss_the_maker : public CreatureScript Knockdown_Timer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); 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(); Talk(SAY_DIE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -129,7 +129,7 @@ class boss_the_maker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetBloodFurnaceAI<boss_the_makerAI>(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index bc399e4b43f..4f1200be37b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -63,7 +63,7 @@ class instance_blood_furnace : public InstanceMapScript PrisonerCounter8 = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -84,13 +84,13 @@ class instance_blood_furnace : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { if (unit->GetTypeId() == TYPEID_UNIT && unit->GetEntry() == NPC_PRISONER) PrisonerDied(unit->GetGUID()); } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -136,7 +136,7 @@ class instance_blood_furnace : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -153,7 +153,7 @@ class instance_blood_furnace : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -170,7 +170,7 @@ class instance_blood_furnace : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -322,7 +322,7 @@ class instance_blood_furnace : public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -333,7 +333,7 @@ class instance_blood_furnace : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -386,7 +386,7 @@ class instance_blood_furnace : public InstanceMapScript uint8 PrisonerCounter8; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_blood_furnace_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index a68b3181e6f..b735a831e35 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -63,7 +63,7 @@ class boss_omor_the_unscarred : public CreatureScript SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { Talk(SAY_WIPE); @@ -80,13 +80,13 @@ class boss_omor_the_unscarred : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (rand()%2) return; @@ -94,7 +94,7 @@ class boss_omor_the_unscarred : public CreatureScript Talk(SAY_KILL_1); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { Talk(SAY_SUMMON); @@ -104,13 +104,13 @@ class boss_omor_the_unscarred : public CreatureScript ++SummonedCount; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DIE); _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -222,7 +222,7 @@ class boss_omor_the_unscarred : public CreatureScript bool CanPullBack; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_omor_the_unscarredAI>(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 205158f606e..424090c87d0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -76,22 +76,22 @@ class boss_nazan : public CreatureScript flight = true; } - void Reset() OVERRIDE + void Reset() override { Fireball_Timer = 4000; Fly_Timer = 45000; Turn_Timer = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { if (summoner->GetEntry() == NPC_VAZRUDEN_HERALD) VazrudenGUID = summoner->GetGUID(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned && summoned->GetEntry() == NPC_LIQUID_FIRE) { @@ -102,13 +102,13 @@ class boss_nazan : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* entry) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* entry) override { if (target && entry->Id == uint32(SPELL_FIREBALL)) me->SummonCreature(NPC_LIQUID_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -188,7 +188,7 @@ class boss_nazan : public CreatureScript uint64 VazrudenGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_nazanAI(creature); } @@ -203,7 +203,7 @@ class boss_vazruden : public CreatureScript { boss_vazrudenAI(Creature* creature) : BossAI(creature, DATA_VAZRUDEN) { } - void Reset() OVERRIDE + void Reset() override { Revenge_Timer = 4000; UnsummonCheck = 2000; @@ -211,26 +211,26 @@ class boss_vazruden : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); _EnterCombat(); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who && who->GetEntry() != NPC_VAZRUDEN) Talk(SAY_KILL); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (killer && killer != me) Talk(SAY_DIE); _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -266,7 +266,7 @@ class boss_vazruden : public CreatureScript uint32 UnsummonCheck; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_vazrudenAI(creature); } @@ -288,7 +288,7 @@ class boss_vazruden_the_herald : public CreatureScript VazrudenGUID = 0; } - void Reset() OVERRIDE + void Reset() override { phase = 0; waypoint = 0; @@ -337,7 +337,7 @@ class boss_vazruden_the_herald : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (phase == 0) { @@ -347,7 +347,7 @@ class boss_vazruden_the_herald : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (!summoned) return; @@ -375,7 +375,7 @@ class boss_vazruden_the_herald : public CreatureScript sentryDown = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { switch (phase) { @@ -443,7 +443,7 @@ class boss_vazruden_the_herald : public CreatureScript bool lootSpawned; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_vazruden_the_heraldAI(creature); } @@ -458,20 +458,20 @@ class npc_hellfire_sentry : public CreatureScript { npc_hellfire_sentryAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { KidneyShot_Timer = urand(3000, 7000); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (Creature* herald = me->FindNearestCreature(NPC_VAZRUDEN_HERALD, 150)) CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(killer); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -492,7 +492,7 @@ class npc_hellfire_sentry : public CreatureScript uint32 KidneyShot_Timer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_hellfire_sentryAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index f1bf63397bf..82f101980fe 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -61,7 +61,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript { boss_watchkeeper_gargolmarAI(Creature* creature) : BossAI(creature, DATA_WATCHKEEPER_GARGOLMAR) { } - void Reset() OVERRIDE + void Reset() override { hasTaunted = false; yelledForHeal = false; @@ -69,7 +69,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MORTAL_WOUND, 5000); @@ -77,7 +77,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript _EnterCombat(); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!me->GetVictim() && me->CanCreatureAttack(who)) @@ -99,18 +99,18 @@ class boss_watchkeeper_gargolmar : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DIE); _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -167,7 +167,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript bool retaliation; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_watchkeeper_gargolmarAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index a8fd639de6d..9a0e7c22308 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -36,13 +36,13 @@ class instance_ramparts : public InstanceMapScript { instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map) { } - void Initialize() OVERRIDE + void Initialize() override { SetBossNumber(EncounterCount); felIronChestGUID = 0; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -53,7 +53,7 @@ class instance_ramparts : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -72,7 +72,7 @@ class instance_ramparts : public InstanceMapScript return true; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -83,7 +83,7 @@ class instance_ramparts : public InstanceMapScript return saveStream.str(); } - void Load(const char* strIn) OVERRIDE + void Load(const char* strIn) override { if (!strIn) { @@ -121,7 +121,7 @@ class instance_ramparts : public InstanceMapScript bool spawned; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_ramparts_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index e1d83931166..91aad3c00eb 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -108,12 +108,12 @@ class npc_abyssal : public CreatureScript uint32 Despawn_Timer; uint32 trigger; - void Reset() OVERRIDE + void Reset() override { FireBlast_Timer = 6000; } - void SpellHit(Unit*, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit*, const SpellInfo* spell) override { if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET) { @@ -136,23 +136,23 @@ class npc_abyssal : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!trigger) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!trigger) ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (trigger) { @@ -188,7 +188,7 @@ class npc_abyssal : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_abyssalAI(creature); } @@ -227,7 +227,7 @@ class boss_magtheridon : public CreatureScript bool Phase3; bool NeedCheckCube; - void Reset() OVERRIDE + void Reset() override { Berserk_Timer = 1320000; Quake_Timer = 40000; @@ -247,7 +247,7 @@ class boss_magtheridon : public CreatureScript DoCast(me, SPELL_SHADOW_CAGE_C, true); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SetData(DATA_MAGTHERIDON_EVENT, NOT_STARTED); instance->SetData(DATA_COLLAPSE, false); @@ -304,28 +304,28 @@ class boss_magtheridon : public CreatureScript NeedCheckCube = false; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_PLAYER_KILLED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetData(DATA_MAGTHERIDON_EVENT, DONE); Talk(SAY_DEATH); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!me->HasUnitState(UNIT_STATE_STUNNED)) ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS); DoZoneInCombat(); @@ -336,7 +336,7 @@ class boss_magtheridon : public CreatureScript Talk(SAY_FREED); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) { @@ -449,7 +449,7 @@ class boss_magtheridon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_magtheridonAI>(creature); } @@ -480,7 +480,7 @@ class npc_hellfire_channeler : public CreatureScript uint32 Check_Timer; - void Reset() OVERRIDE + void Reset() override { ShadowBoltVolley_Timer = urand(8000, 10000); DarkMending_Timer = 10000; @@ -490,7 +490,7 @@ class npc_hellfire_channeler : public CreatureScript Check_Timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS); @@ -498,30 +498,30 @@ class npc_hellfire_channeler : public CreatureScript DoZoneInCombat(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED); DoCast(me, SPELL_SHADOW_GRASP_C, false); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summon->AI()->AttackStart(me->GetVictim()); } - void DamageTaken(Unit*, uint32 &damage) OVERRIDE + void DamageTaken(Unit*, uint32 &damage) override { if (damage >= me->GetHealth()) DoCast(me, SPELL_SOUL_TRANSFER, true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetData(DATA_CHANNELER_EVENT, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -565,7 +565,7 @@ class npc_hellfire_channeler : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_hellfire_channelerAI>(creature); } @@ -579,7 +579,7 @@ public: { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 73f741fade1..71d9203fcac 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -66,7 +66,7 @@ class instance_magtheridons_lair : public InstanceMapScript uint32 CageTimer; uint32 RespawnTimer; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -79,7 +79,7 @@ class instance_magtheridons_lair : public InstanceMapScript RespawnTimer = 0; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -88,7 +88,7 @@ class instance_magtheridons_lair : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -101,7 +101,7 @@ class instance_magtheridons_lair : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -123,7 +123,7 @@ class instance_magtheridons_lair : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -133,7 +133,7 @@ class instance_magtheridons_lair : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -211,14 +211,14 @@ class instance_magtheridons_lair : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_MAGTHERIDON_EVENT) return m_auiEncounter[0]; return 0; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (CageTimer) { @@ -254,7 +254,7 @@ class instance_magtheridons_lair : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_magtheridons_lair_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 69906880705..187e5b4993b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -85,7 +85,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript { boss_grand_warlock_nethekurseAI(Creature* creature) : BossAI(creature, DATA_NETHEKURSE) { } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -105,14 +105,14 @@ class boss_grand_warlock_nethekurse : public CreatureScript Cleave_Timer = 5000; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DIE); instance->SetBossState(DATA_NETHEKURSE, DONE); } - void SetData(uint32 data, uint32 value) OVERRIDE + void SetData(uint32 data, uint32 value) override { if (data != SETDATA_DATA) return; @@ -157,7 +157,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (IsIntroEvent || !IsMainEvent) return; @@ -171,7 +171,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!IntroOnce && me->IsWithinDistInMap(who, 30.0f)) @@ -192,12 +192,12 @@ class boss_grand_warlock_nethekurse : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -208,12 +208,12 @@ class boss_grand_warlock_nethekurse : public CreatureScript summoned->CastSpell(summoned, SPELL_CONSUMPTION, false, 0, 0, me->GetGUID()); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsIntroEvent) { @@ -290,7 +290,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript bool Phase; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_grand_warlock_nethekurseAI>(creature); } @@ -312,14 +312,14 @@ class npc_fel_orc_convert : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { me->SetNoCallAssistance(true); //we don't want any assistance (WE R HEROZ!) } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_HEMORRHAGE, 3000); @@ -328,7 +328,7 @@ class npc_fel_orc_convert : public CreatureScript Kurse->AI()->SetData(SETDATA_DATA, SETDATA_PEON_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance->GetBossState(DATA_NETHEKURSE) != IN_PROGRESS) return; @@ -337,7 +337,7 @@ class npc_fel_orc_convert : public CreatureScript Kurse->AI()->SetData(SETDATA_DATA, SETDATA_PEON_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -358,7 +358,7 @@ class npc_fel_orc_convert : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_fel_orc_convertAI>(creature); } @@ -377,13 +377,13 @@ class npc_lesser_shadow_fissure : public CreatureScript { npc_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void MoveInLineOfSight(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void EnterCombat(Unit* /*who*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_lesser_shadow_fissureAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 2ed70ded6ef..69be4b46eff 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -140,7 +140,7 @@ class boss_warbringer_omrogg : public CreatureScript RightHeadGUID = 0; } - void Reset() OVERRIDE + void Reset() override { if (Unit* LeftHead = Unit::GetUnit(*me, LeftHeadGUID)) { @@ -188,7 +188,7 @@ class boss_warbringer_omrogg : public CreatureScript ThreatYell = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); @@ -206,7 +206,7 @@ class boss_warbringer_omrogg : public CreatureScript instance->SetBossState(DATA_OMROGG, IN_PROGRESS); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_LEFT_HEAD) LeftHeadGUID = summoned->GetGUID(); @@ -219,7 +219,7 @@ class boss_warbringer_omrogg : public CreatureScript summoned->SetVisible(false); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Creature* LeftHead = Creature::GetCreature(*me, LeftHeadGUID); Creature* RightHead = Creature::GetCreature(*me, RightHeadGUID); @@ -245,7 +245,7 @@ class boss_warbringer_omrogg : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Creature* LeftHead = Creature::GetCreature(*me, LeftHeadGUID); Creature* RightHead = Creature::GetCreature(*me, RightHeadGUID); @@ -260,7 +260,7 @@ class boss_warbringer_omrogg : public CreatureScript instance->SetBossState(DATA_OMROGG, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Delay_Timer <= diff) { @@ -383,7 +383,7 @@ class boss_warbringer_omrogg : public CreatureScript uint32 ResetThreat_Timer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_warbringer_omroggAI>(creature); } @@ -405,9 +405,9 @@ class npc_omrogg_heads : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void SetData(uint32 data, uint32 value) { @@ -417,7 +417,7 @@ class npc_omrogg_heads : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -433,7 +433,7 @@ class npc_omrogg_heads : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_omrogg_headsAI>(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index bdb109910a8..f918038b369 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -67,7 +67,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript { boss_warchief_kargath_bladefistAI(Creature* creature) : BossAI(creature, DATA_KARGATH) { } - void Reset() OVERRIDE + void Reset() override { removeAdds(); @@ -85,7 +85,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript resetcheck_timer = 5000; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); removeAdds(); @@ -93,12 +93,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript instance->SetBossState(DATA_KARGATH, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { switch (summoned->GetEntry()) { @@ -114,7 +114,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TYPEID_PLAYER) { @@ -122,7 +122,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (InBlade) { @@ -175,7 +175,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -308,7 +308,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript bool InBlade; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_warchief_kargath_bladefistAI>(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 25ecf5331ad..a220f26e18b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -32,7 +32,7 @@ class instance_shattered_halls : public InstanceMapScript public: instance_shattered_halls() : InstanceMapScript("instance_shattered_halls", 540) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_shattered_halls_InstanceMapScript(map); } @@ -41,7 +41,7 @@ class instance_shattered_halls : public InstanceMapScript { instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map) { } - void Initialize() OVERRIDE + void Initialize() override { SetBossNumber(EncounterCount); nethekurseGUID = 0; @@ -49,7 +49,7 @@ class instance_shattered_halls : public InstanceMapScript nethekurseDoor2GUID = 0; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -62,7 +62,7 @@ class instance_shattered_halls : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -72,7 +72,7 @@ class instance_shattered_halls : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -97,7 +97,7 @@ class instance_shattered_halls : public InstanceMapScript return true; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -114,7 +114,7 @@ class instance_shattered_halls : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -125,7 +125,7 @@ class instance_shattered_halls : public InstanceMapScript return saveStream.str(); } - void Load(const char* strIn) OVERRIDE + void Load(const char* strIn) override { if (!strIn) { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 00c4577dab6..ead163b3a82 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -107,7 +107,7 @@ class boss_alar : public CreatureScript int8 cur_wp; - void Reset() OVERRIDE + void Reset() override { instance->SetData(DATA_ALAREVENT, NOT_STARTED); @@ -133,7 +133,7 @@ class boss_alar : public CreatureScript me->setActive(false); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SetData(DATA_ALAREVENT, IN_PROGRESS); @@ -142,21 +142,21 @@ class boss_alar : public CreatureScript me->setActive(true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetData(DATA_ALAREVENT, DONE); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == CREATURE_EMBER_OF_ALAR) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summon->AI()->AttackStart(target); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (Phase1) AttackStartNoMove(who); @@ -164,7 +164,7 @@ class boss_alar : public CreatureScript ScriptedAI::AttackStart(who); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*killer*/, uint32 &damage) override { if (damage >= me->GetHealth() && Phase1) { @@ -186,7 +186,7 @@ class boss_alar : public CreatureScript } } - void SpellHit(Unit*, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit*, const SpellInfo* spell) override { if (spell->Id == SPELL_DIVE_BOMB_VISUAL) { @@ -196,7 +196,7 @@ class boss_alar : public CreatureScript } } - void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE + void MovementInform(uint32 type, uint32 /*id*/) override { if (type == POINT_MOTION_TYPE) { @@ -206,7 +206,7 @@ class boss_alar : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) // sometimes IsInCombat but !incombat, faction bug? return; @@ -446,7 +446,7 @@ class boss_alar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_alarAI>(creature); } @@ -469,22 +469,22 @@ class npc_ember_of_alar : public CreatureScript InstanceScript* instance; bool toDie; - void Reset() OVERRIDE + void Reset() override { toDie = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { me->setDeathState(JUST_DIED); } - void DamageTaken(Unit* killer, uint32& damage) OVERRIDE + void DamageTaken(Unit* killer, uint32& damage) override { if (damage >= me->GetHealth() && killer != me && !toDie) { @@ -507,7 +507,7 @@ class npc_ember_of_alar : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -523,7 +523,7 @@ class npc_ember_of_alar : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_ember_of_alarAI>(creature); } @@ -537,15 +537,15 @@ class npc_flame_patch_alar : public CreatureScript struct npc_flame_patch_alarAI : public ScriptedAI { npc_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(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_flame_patch_alarAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 7caf1fd1771..5f92445f9dd 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -130,7 +130,7 @@ class boss_high_astromancer_solarian : public CreatureScript bool AppearDelay; bool BlindingLight; - void Reset() OVERRIDE + void Reset() override { ArcaneMissiles_Timer = 2000; m_uiWrathOfTheAstromancer_Timer = 15000; @@ -157,12 +157,12 @@ class boss_high_astromancer_solarian : public CreatureScript Summons.DespawnAll(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->SetObjectScale(defaultsize); me->SetDisplayId(MODEL_HUMAN); @@ -170,7 +170,7 @@ class boss_high_astromancer_solarian : public CreatureScript instance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); DoZoneInCombat(); @@ -205,7 +205,7 @@ class boss_high_astromancer_solarian : public CreatureScript return (z*sqrt(radius*radius - (x - CENTER_X)*(x - CENTER_X)) + CENTER_Y); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -414,7 +414,7 @@ class boss_high_astromancer_solarian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_high_astromancer_solarianAI>(creature); } @@ -442,18 +442,18 @@ class npc_solarium_priest : public CreatureScript uint32 holysmiteTimer; uint32 aoesilenceTimer; - void Reset() OVERRIDE + void Reset() override { healTimer = 9000; holysmiteTimer = 1; aoesilenceTimer = 15000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -500,7 +500,7 @@ class npc_solarium_priest : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_solarium_priestAI>(creature); } @@ -515,7 +515,7 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader { PrepareAuraScript(spell_astromancer_wrath_of_the_astromancer_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WRATH_OF_THE_ASTROMANCER_DOT)) return false; @@ -532,13 +532,13 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader target->CastSpell(target, GetSpellInfo()->Effects[EFFECT_1].CalcValue(), false); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_astromancer_wrath_of_the_astromancer_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_astromancer_wrath_of_the_astromancer_AuraScript(); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 077539b6b88..016e68a4e8d 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -165,7 +165,7 @@ struct advisorbase_ai : public ScriptedAI uint32 DelayRes_Timer; uint64 DelayRes_Target; - void Reset() OVERRIDE + void Reset() override { if (m_bDoubled_Health) { @@ -187,7 +187,7 @@ struct advisorbase_ai : public ScriptedAI Kaelthas->AI()->EnterEvadeMode(); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -196,7 +196,7 @@ struct advisorbase_ai : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -217,7 +217,7 @@ struct advisorbase_ai : public ScriptedAI DelayRes_Timer = 2000; } - void DamageTaken(Unit* killer, uint32 &damage) OVERRIDE + void DamageTaken(Unit* killer, uint32 &damage) override { if (damage < me->GetHealth()) return; @@ -253,7 +253,7 @@ struct advisorbase_ai : public ScriptedAI } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (DelayRes_Timer) { @@ -318,7 +318,7 @@ class boss_kaelthas : public CreatureScript uint64 m_auiAdvisorGuid[MAX_ADVISORS]; - void Reset() OVERRIDE + void Reset() override { Fireball_Timer = 5000+rand()%10000; ArcaneDisruption_Timer = 45000; @@ -399,7 +399,7 @@ class boss_kaelthas : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!me->HasUnitState(UNIT_STATE_STUNNED) && me->CanCreatureAttack(who)) @@ -427,18 +427,18 @@ class boss_kaelthas : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (!instance->GetData(DATA_KAELTHASEVENT) && !Phase) StartEvent(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { // if not phoenix, then it's one of the 7 weapons if (summoned->GetEntry() != NPC_PHOENIX) @@ -450,12 +450,12 @@ class boss_kaelthas : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { summons.Despawn(summon); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -473,7 +473,7 @@ class boss_kaelthas : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Phase 1 switch (Phase) @@ -1000,7 +1000,7 @@ class boss_kaelthas : public CreatureScript } } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_kaelthasAI>(creature); } @@ -1023,7 +1023,7 @@ class boss_thaladred_the_darkener : public CreatureScript uint32 Silence_Timer; uint32 PsychicBlow_Timer; - void Reset() OVERRIDE + void Reset() override { Gaze_Timer = 100; Silence_Timer = 20000; @@ -1032,7 +1032,7 @@ class boss_thaladred_the_darkener : public CreatureScript advisorbase_ai::Reset(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1044,13 +1044,13 @@ class boss_thaladred_the_darkener : public CreatureScript me->AddThreat(who, 5000000.0f); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_THALADRED_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { advisorbase_ai::UpdateAI(diff); @@ -1098,7 +1098,7 @@ class boss_thaladred_the_darkener : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_thaladred_the_darkenerAI>(creature); } @@ -1119,13 +1119,13 @@ class boss_lord_sanguinar : public CreatureScript uint32 Fear_Timer; - void Reset() OVERRIDE + void Reset() override { Fear_Timer = 20000; advisorbase_ai::Reset(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1136,13 +1136,13 @@ class boss_lord_sanguinar : public CreatureScript Talk(SAY_SANGUINAR_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_SANGUINAR_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { advisorbase_ai::UpdateAI(diff); @@ -1166,7 +1166,7 @@ class boss_lord_sanguinar : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_lord_sanguinarAI>(creature); } @@ -1190,7 +1190,7 @@ class boss_grand_astromancer_capernian : public CreatureScript uint32 Yell_Timer; bool Yell; - void Reset() OVERRIDE + void Reset() override { Fireball_Timer = 2000; Conflagration_Timer = 20000; @@ -1201,13 +1201,13 @@ class boss_grand_astromancer_capernian : public CreatureScript advisorbase_ai::Reset(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_CAPERNIAN_DEATH); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1222,7 +1222,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1231,7 +1231,7 @@ class boss_grand_astromancer_capernian : public CreatureScript return; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { advisorbase_ai::UpdateAI(diff); @@ -1310,7 +1310,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_grand_astromancer_capernianAI>(creature); } @@ -1332,7 +1332,7 @@ class boss_master_engineer_telonicus : public CreatureScript uint32 Bomb_Timer; uint32 RemoteToy_Timer; - void Reset() OVERRIDE + void Reset() override { Bomb_Timer = 10000; RemoteToy_Timer = 5000; @@ -1340,13 +1340,13 @@ class boss_master_engineer_telonicus : public CreatureScript advisorbase_ai::Reset(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_TELONICUS_DEATH); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1357,7 +1357,7 @@ class boss_master_engineer_telonicus : public CreatureScript Talk(SAY_TELONICUS_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { advisorbase_ai::UpdateAI(diff); @@ -1393,7 +1393,7 @@ class boss_master_engineer_telonicus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_master_engineer_telonicusAI>(creature); } @@ -1419,7 +1419,7 @@ class npc_kael_flamestrike : public CreatureScript bool Casting; bool KillSelf; - void Reset() OVERRIDE + void Reset() override { Timer = 5000; Casting = false; @@ -1429,12 +1429,12 @@ class npc_kael_flamestrike : public CreatureScript me->setFaction(14); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Casting) { @@ -1461,7 +1461,7 @@ class npc_kael_flamestrike : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kael_flamestrikeAI(creature); } @@ -1482,20 +1482,20 @@ class npc_phoenix_tk : public CreatureScript uint32 Cycle_Timer; - void Reset() OVERRIDE + void Reset() override { Cycle_Timer = 2000; DoCast(me, SPELL_BURN, true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { //is this spell in use anylonger? //DoCast(me, SPELL_EMBER_BLAST, true); me->SummonCreature(NPC_PHOENIX_EGG, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 16000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1515,7 +1515,7 @@ class npc_phoenix_tk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_phoenix_tkAI(creature); } @@ -1536,16 +1536,16 @@ class npc_phoenix_egg_tk : public CreatureScript uint32 Rebirth_Timer; - void Reset() OVERRIDE + void Reset() override { Rebirth_Timer = 15000; } //ignore any - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->Attack(who, false)) { @@ -1556,13 +1556,13 @@ class npc_phoenix_egg_tk : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AddThreat(me->GetVictim(), 0.0f); summoned->CastSpell(summoned, SPELL_REBIRTH, false); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Rebirth_Timer) return; @@ -1577,7 +1577,7 @@ class npc_phoenix_egg_tk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_phoenix_egg_tkAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 1a972f65360..58b5972c25c 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -68,7 +68,7 @@ class boss_void_reaver : public CreatureScript bool Enraged; - void Reset() OVERRIDE + void Reset() override { Pounding_Timer = 15000; ArcaneOrb_Timer = 3000; @@ -81,12 +81,12 @@ class boss_void_reaver : public CreatureScript instance->SetData(DATA_VOIDREAVEREVENT, NOT_STARTED); } - 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); DoZoneInCombat(); @@ -94,14 +94,14 @@ class boss_void_reaver : public CreatureScript instance->SetData(DATA_VOIDREAVEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetData(DATA_VOIDREAVEREVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -168,7 +168,7 @@ class boss_void_reaver : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<boss_void_reaverAI>(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index fcace2a3ab4..0da16967a49 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -60,7 +60,7 @@ class instance_the_eye : public InstanceMapScript uint32 m_auiEncounter[MAX_ENCOUNTER]; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -76,7 +76,7 @@ class instance_the_eye : public InstanceMapScript AlarEventPhase = 0; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -85,7 +85,7 @@ class instance_the_eye : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -113,7 +113,7 @@ class instance_the_eye : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -128,7 +128,7 @@ class instance_the_eye : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -151,7 +151,7 @@ class instance_the_eye : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -163,7 +163,7 @@ class instance_the_eye : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -174,7 +174,7 @@ class instance_the_eye : public InstanceMapScript return stream.str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -192,7 +192,7 @@ class instance_the_eye : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_the_eye_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index a09dd4c756e..32af9f647ad 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -52,17 +52,17 @@ class npc_crystalcore_devastator : public CreatureScript uint32 Knockaway_Timer; uint32 Countercharge_Timer; - void Reset() OVERRIDE + void Reset() override { Countercharge_Timer = 9000; Knockaway_Timer = 25000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -100,7 +100,7 @@ class npc_crystalcore_devastator : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_crystalcore_devastatorAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp index 05050b4be2e..a60609e0656 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -59,13 +59,13 @@ class boss_gatewatcher_gyrokill : public CreatureScript { boss_gatewatcher_gyrokillAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_GYROKILL) { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000); @@ -74,12 +74,12 @@ class boss_gatewatcher_gyrokill : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -115,7 +115,7 @@ class boss_gatewatcher_gyrokill : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gatewatcher_gyrokillAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 09eb261282f..151244f86c9 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -62,7 +62,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript { boss_gatewatcher_iron_handAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_IRON_HAND) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 55000); @@ -71,19 +71,19 @@ class boss_gatewatcher_iron_hand : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (roll_chance_i(50)) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -122,7 +122,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gatewatcher_iron_handAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp index 649544e452f..f8861d1fa7f 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp @@ -75,7 +75,7 @@ class boss_mechano_lord_capacitus : public CreatureScript { boss_mechano_lord_capacitusAI(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(YELL_AGGRO); @@ -88,18 +88,18 @@ class boss_mechano_lord_capacitus : public CreatureScript events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 15 * IN_MILLISECONDS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(YELL_KILL); } - void JustDied(Unit* /*victim*/) OVERRIDE + void JustDied(Unit* /*victim*/) override { _JustDied(); Talk(YELL_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -150,7 +150,7 @@ class boss_mechano_lord_capacitus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_mechano_lord_capacitusAI(creature); } @@ -165,7 +165,7 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader { PrepareSpellScript(spell_capacitus_polarity_charge_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_CHARGE)) return false; @@ -211,14 +211,14 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader SetHitDamage(0); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_charge_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_capacitus_polarity_charge_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_capacitus_polarity_charge_SpellScript(); } @@ -233,7 +233,7 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader { PrepareSpellScript(spell_capacitus_polarity_shift_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_POLARITY) || !sSpellMgr->GetSpellInfo(SPELL_NEGATIVE_POLARITY)) return false; @@ -248,13 +248,13 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader target->CastSpell(target, roll_chance_i(50) ? SPELL_POSITIVE_POLARITY : SPELL_NEGATIVE_POLARITY, true, NULL, NULL, caster->GetGUID()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_capacitus_polarity_shift_SpellScript(); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index d7e8eabd32f..3e4e6a213bd 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -67,7 +67,7 @@ class boss_nethermancer_sepethrea : public CreatureScript { boss_nethermancer_sepethreaAI(Creature* creature) : BossAI(creature, DATA_NETHERMANCER_SEPRETHREA) { } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { _EnterCombat(); events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000)); @@ -80,18 +80,18 @@ class boss_nethermancer_sepethrea : public CreatureScript Talk(SAY_SUMMON); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -136,7 +136,7 @@ class boss_nethermancer_sepethrea : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_nethermancer_sepethreaAI(creature); } @@ -162,7 +162,7 @@ class npc_ragin_flames : public CreatureScript bool onlyonce; - void Reset() OVERRIDE + void Reset() override { inferno_Timer = 10000; flame_timer = 500; @@ -173,11 +173,11 @@ class npc_ragin_flames : public CreatureScript me->SetSpeed(MOVE_RUN, DUNGEON_MODE(0.5f, 0.7f)); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check_Timer if (Check_Timer <= diff) @@ -218,7 +218,7 @@ class npc_ragin_flames : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetInstanceAI<npc_ragin_flamesAI>(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 8d6dde82770..3c6fe2040fc 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -75,7 +75,7 @@ class boss_pathaleon_the_calculator : public CreatureScript { boss_pathaleon_the_calculatorAI(Creature* creature) : BossAI(creature, DATA_PATHALEON_THE_CALCULATOR) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_SUMMON, 30000); @@ -86,18 +86,18 @@ class boss_pathaleon_the_calculator : public CreatureScript 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(); Talk(SAY_DEATH); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (me->HealthBelowPctDamaged(20, damage) && !me->HasAura(SPELL_FRENZY)) { @@ -106,7 +106,7 @@ class boss_pathaleon_the_calculator : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -158,7 +158,7 @@ class boss_pathaleon_the_calculator : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_pathaleon_the_calculatorAI(creature); } @@ -179,7 +179,7 @@ class npc_nether_wraith : public CreatureScript uint32 Die_Timer; bool Detonation; - void Reset() OVERRIDE + void Reset() override { ArcaneMissiles_Timer = urand(1000, 4000); Detonation_Timer = 20000; @@ -187,9 +187,9 @@ class npc_nether_wraith : public CreatureScript Detonation = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -230,7 +230,7 @@ class npc_nether_wraith : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nether_wraithAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index 9d2556d809b..4dddee83459 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -55,7 +55,7 @@ class instance_mechanar : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* gameObject) OVERRIDE + void OnGameObjectRemove(GameObject* gameObject) override { switch (gameObject->GetEntry()) { @@ -69,7 +69,7 @@ class instance_mechanar : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -89,7 +89,7 @@ class instance_mechanar : public InstanceMapScript return true; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -100,7 +100,7 @@ class instance_mechanar : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) OVERRIDE + void Load(const char* str) override { if (!str) { @@ -133,7 +133,7 @@ class instance_mechanar : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_mechanar_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 3cc2e5dcc89..3befc3742ff 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -88,7 +88,7 @@ class npc_millhouse_manastorm : public CreatureScript uint32 Pyroblast_Timer; uint32 Fireball_Timer; - void Reset() OVERRIDE + void Reset() override { EventProgress_Timer = 2000; LowHp = false; @@ -105,7 +105,7 @@ class npc_millhouse_manastorm : public CreatureScript Talk(SAY_COMPLETE); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->Attack(who, true)) { @@ -116,13 +116,13 @@ class npc_millhouse_manastorm : public CreatureScript } } - 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 { Talk(SAY_DEATH); @@ -131,7 +131,7 @@ class npc_millhouse_manastorm : public CreatureScript ->FailQuest();*/ } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Init) { @@ -213,7 +213,7 @@ class npc_millhouse_manastorm : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetArcatrazAI<npc_millhouse_manastormAI>(creature); } @@ -282,7 +282,7 @@ class npc_warden_mellichar : public CreatureScript uint32 EventProgress_Timer; uint32 Phase; - void Reset() OVERRIDE + void Reset() override { IsRunning = false; CanSpawn = false; @@ -296,9 +296,9 @@ class npc_warden_mellichar : public CreatureScript instance->SetBossState(DATA_HARBINGER_SKYRISS, NOT_STARTED); } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (IsRunning) return; @@ -316,7 +316,7 @@ class npc_warden_mellichar : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(YELL_INTRO1); DoCast(me, SPELL_BUBBLE_VISUAL); @@ -377,7 +377,7 @@ class npc_warden_mellichar : public CreatureScript CanSpawn = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!IsRunning) return; @@ -490,7 +490,7 @@ class npc_warden_mellichar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetArcatrazAI<npc_warden_mellicharAI>(creature); } @@ -516,7 +516,7 @@ class npc_zerekethvoidzone : public CreatureScript { npc_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->SetUInt32Value(UNIT_NPC_FLAGS, 0); me->setFaction(16); @@ -525,10 +525,10 @@ class npc_zerekethvoidzone : public CreatureScript DoCast(me, SPELL_VOID_ZONE_DAMAGE); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_zerekethvoidzoneAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp index 18388341a36..41bc93cfdfe 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp @@ -65,14 +65,14 @@ class boss_dalliah_the_doomsayer : public CreatureScript soccothratesDeath = false; } - void Reset() OVERRIDE + void Reset() override { _Reset(); soccothratesTaunt = false; soccothratesDeath = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -82,7 +82,7 @@ class boss_dalliah_the_doomsayer : public CreatureScript soccothrates->AI()->SetData(1, 1); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, urand(1000, 4000)); @@ -93,12 +93,12 @@ class boss_dalliah_the_doomsayer : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void SetData(uint32 /*type*/, uint32 data) OVERRIDE + void SetData(uint32 /*type*/, uint32 data) override { switch (data) { @@ -111,7 +111,7 @@ class boss_dalliah_the_doomsayer : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -187,7 +187,7 @@ class boss_dalliah_the_doomsayer : public CreatureScript bool soccothratesDeath; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetArcatrazAI<boss_dalliah_the_doomsayerAI>(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index e94de3af56e..1917bae1a6c 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -81,7 +81,7 @@ class boss_harbinger_skyriss : public CreatureScript uint32 Domination_Timer; uint32 ManaBurn_Timer; - void Reset() OVERRIDE + void Reset() override { if (!Intro) me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); @@ -97,7 +97,7 @@ class boss_harbinger_skyriss : public CreatureScript ManaBurn_Timer = 25000; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!Intro) return; @@ -105,15 +105,15 @@ class boss_harbinger_skyriss : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); _JustDied(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (!summon) return; @@ -126,7 +126,7 @@ class boss_harbinger_skyriss : public CreatureScript summon->AI()->AttackStart(target); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { //won't yell killing pet/other unit if (victim->GetEntry() == NPC_ALPHA_POD_TARGET) @@ -148,7 +148,7 @@ class boss_harbinger_skyriss : public CreatureScript DoCast(me, SPELL_33_ILLUSION); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Intro) { @@ -262,7 +262,7 @@ class boss_harbinger_skyriss : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetArcatrazAI<boss_harbinger_skyrissAI>(creature); } @@ -277,12 +277,12 @@ class boss_harbinger_skyriss_illusion : public CreatureScript { boss_harbinger_skyriss_illusionAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_harbinger_skyriss_illusionAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp index 6c96708c69d..a519ec7207c 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp @@ -89,7 +89,7 @@ class boss_wrath_scryer_soccothrates : public CreatureScript dalliahDeath = false; } - void Reset() OVERRIDE + void Reset() override { _Reset(); preFight = false; @@ -98,7 +98,7 @@ class boss_wrath_scryer_soccothrates : public CreatureScript DoCast(me, SPELL_FEL_IMMOLATION); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -108,7 +108,7 @@ class boss_wrath_scryer_soccothrates : public CreatureScript dalliah->AI()->SetData(1, 1); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000)); @@ -118,12 +118,12 @@ class boss_wrath_scryer_soccothrates : public CreatureScript preFight = false; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (instance->GetData(DATA_CONVERSATION) == NOT_STARTED && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 70.0f)) { @@ -135,7 +135,7 @@ class boss_wrath_scryer_soccothrates : public CreatureScript } } - void SetData(uint32 /*type*/, uint32 data) OVERRIDE + void SetData(uint32 /*type*/, uint32 data) override { switch (data) { @@ -148,7 +148,7 @@ class boss_wrath_scryer_soccothrates : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -276,7 +276,7 @@ class boss_wrath_scryer_soccothrates : public CreatureScript bool dalliahDeath; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetArcatrazAI<boss_wrath_scryer_soccothratesAI>(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp index 54246453100..4b43edef2e0 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp @@ -50,18 +50,18 @@ class boss_zereketh_the_unbound : public CreatureScript { boss_zereketh_the_unboundAI(Creature* creature) : BossAI(creature, DATA_ZEREKETH) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_VOID_ZONE, urand (6000, 10000)); @@ -70,12 +70,12 @@ class boss_zereketh_the_unbound : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -113,7 +113,7 @@ class boss_zereketh_the_unbound : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_zereketh_the_unboundAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 90feaa8d091..a6d0b348984 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -49,7 +49,7 @@ class instance_arcatraz : public InstanceMapScript memset(StasisPodStates, NOT_STARTED, 5 * sizeof(uint8)); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -67,7 +67,7 @@ class instance_arcatraz : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -98,7 +98,7 @@ class instance_arcatraz : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -111,7 +111,7 @@ class instance_arcatraz : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -132,7 +132,7 @@ class instance_arcatraz : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -150,7 +150,7 @@ class instance_arcatraz : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -168,7 +168,7 @@ class instance_arcatraz : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -191,7 +191,7 @@ class instance_arcatraz : public InstanceMapScript return true; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -202,7 +202,7 @@ class instance_arcatraz : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -245,7 +245,7 @@ class instance_arcatraz : public InstanceMapScript uint8 StasisPodStates[5]; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_arcatraz_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index fefb791715f..7b831e82a75 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -52,13 +52,13 @@ class boss_commander_sarannis : public CreatureScript { boss_commander_sarannisAI(Creature* creature) : BossAI(creature, DATA_COMMANDER_SARANNIS) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _phase = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -66,18 +66,18 @@ class boss_commander_sarannis : public CreatureScript events.ScheduleEvent(EVENT_ARCANE_DEVASTATION, 15200); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*killer*/, uint32 &damage) override { if (me->HealthBelowPctDamaged(50, damage) && _phase) { @@ -88,12 +88,12 @@ class boss_commander_sarannis : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { BossAI::JustSummoned(summon); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -129,7 +129,7 @@ class boss_commander_sarannis : public CreatureScript bool _phase; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_commander_sarannisAI(creature); } @@ -167,13 +167,13 @@ class spell_commander_sarannis_summon_reinforcements : public SpellScriptLoader GetCaster()->SummonCreature(NPC_SUMMONED_BLOODWARDER_RESERVIST, PosSummonReinforcements[3], TEMPSUMMON_CORPSE_DESPAWN); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_commander_sarannis_summon_reinforcements_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_commander_sarannis_summon_reinforcements_SpellScript(); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index db62a0e91b3..53727db2f4b 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -74,7 +74,7 @@ class boss_high_botanist_freywinn : public CreatureScript uint32 DeadAddsCount; bool MoveFree; - void Reset() OVERRIDE + void Reset() override { Adds_List.clear(); @@ -85,12 +85,12 @@ class boss_high_botanist_freywinn : public CreatureScript MoveFree = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_FRAYER) Adds_List.push_back(summoned->GetGUID()); @@ -107,17 +107,17 @@ class boss_high_botanist_freywinn : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -200,7 +200,7 @@ class boss_high_botanist_freywinn : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_high_botanist_freywinnAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 839b452e631..8cab7485510 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -70,7 +70,7 @@ class boss_laj : public CreatureScript uint32 Transform_Timer; uint32 Allergic_Timer; - void Reset() OVERRIDE + void Reset() override { me->SetDisplayId(MODEL_DEFAULT); me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true); @@ -157,17 +157,17 @@ class boss_laj : public CreatureScript CanSummon = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon && me->GetVictim()) summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -213,7 +213,7 @@ class boss_laj : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lajAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index cc3ffc26edf..d2a1d101ae4 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp @@ -54,14 +54,14 @@ class boss_thorngrin_the_tender : public CreatureScript { boss_thorngrin_the_tenderAI(Creature* creature) : BossAI(creature, DATA_THORNGRIN_THE_TENDER) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _phase1 = true; _phase2 = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -70,18 +70,18 @@ class boss_thorngrin_the_tender : public CreatureScript events.ScheduleEvent(EVENT_ENRAGE, 12000); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*killer*/, uint32 &damage) override { if (me->HealthBelowPctDamaged(50, damage) && _phase1) { @@ -95,7 +95,7 @@ class boss_thorngrin_the_tender : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -140,7 +140,7 @@ class boss_thorngrin_the_tender : public CreatureScript bool _phase2; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_thorngrin_the_tenderAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 78a7d71732a..c9dd31cdc76 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -81,17 +81,17 @@ class npc_warp_splinter_treant : public CreatureScript uint64 WarpGuid; uint32 check_Timer; - void Reset() OVERRIDE + void Reset() override { check_Timer = 0; } - 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 { if (!UpdateVictim() || !me->GetVictim()) { @@ -119,7 +119,7 @@ class npc_warp_splinter_treant : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_warp_splinter_treantAI(creature); } @@ -151,7 +151,7 @@ class boss_warp_splinter : public CreatureScript float Treant_Spawn_Pos_X; float Treant_Spawn_Pos_Y; - void Reset() OVERRIDE + void Reset() override { War_Stomp_Timer = urand(25000, 40000); Summon_Treants_Timer = 45000; @@ -160,17 +160,17 @@ class boss_warp_splinter : public CreatureScript me->SetSpeed(MOVE_RUN, 0.7f, true); } - 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); } @@ -191,7 +191,7 @@ class boss_warp_splinter : public CreatureScript Talk(SAY_SUMMON); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -227,7 +227,7 @@ class boss_warp_splinter : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_warp_splinterAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp index 72202c5d896..f8929f7e42a 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp @@ -35,7 +35,7 @@ class instance_the_botanica : public InstanceMapScript WarpSplinterGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -59,7 +59,7 @@ class instance_the_botanica : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -80,7 +80,7 @@ class instance_the_botanica : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -100,7 +100,7 @@ class instance_the_botanica : public InstanceMapScript return true; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -111,7 +111,7 @@ class instance_the_botanica : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -152,7 +152,7 @@ class instance_the_botanica : public InstanceMapScript uint64 WarpSplinterGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_the_botanica_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index 3da0ee61aa3..eea03aae343 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -69,7 +69,7 @@ class boss_doomlord_kazzak : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_SHADOW_VOLLEY, urand(6000, 10000)); @@ -82,17 +82,17 @@ class boss_doomlord_kazzak : public CreatureScript _events.ScheduleEvent(EVENT_BERSERK, 180000); } - void JustRespawned() OVERRIDE + void JustRespawned() override { Talk(SAY_INTRO); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { // When Kazzak kills a player (not pets/totems), he regens some health if (victim->GetTypeId() != TYPEID_PLAYER) @@ -103,12 +103,12 @@ class boss_doomlord_kazzak : public CreatureScript Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // Return since we have no target if (!UpdateVictim()) @@ -169,7 +169,7 @@ class boss_doomlord_kazzak : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_doomlordkazzakAI(creature); } @@ -184,7 +184,7 @@ class spell_mark_of_kazzak : public SpellScriptLoader { PrepareAuraScript(spell_mark_of_kazzak_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_KAZZAK_DAMAGE)) return false; @@ -209,14 +209,14 @@ class spell_mark_of_kazzak : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mark_of_kazzak_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazzak_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mark_of_kazzak_AuraScript(); } diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index 46777abce6a..a193e8ff880 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -59,7 +59,7 @@ class boss_doomwalker : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_ENRAGE, 0); @@ -70,7 +70,7 @@ class boss_doomwalker : public CreatureScript _inEnrage = false; } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { victim->CastSpell(victim, SPELL_MARK_DEATH, 0); @@ -80,17 +80,17 @@ class boss_doomwalker : public CreatureScript Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsValidAttackTarget(who)) @@ -98,7 +98,7 @@ class boss_doomwalker : public CreatureScript who->CastSpell(who, SPELL_AURA_DEATH, 1); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -159,7 +159,7 @@ class boss_doomwalker : public CreatureScript bool _inEnrage; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_doomwalkerAI(creature); } diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index fdeaa1c2520..d21b92d3e92 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -75,15 +75,15 @@ public: uint64 OgreGUID; - void Reset() OVERRIDE + void Reset() override { OgreGUID = 0; } - 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_bloodmaul_brutebaneAI(creature); } @@ -119,13 +119,13 @@ public: hp30 = false; } - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; hp30 = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (urand (0, 100) < 35) Talk(SAY_AGGRO); @@ -134,14 +134,14 @@ public: events.ScheduleEvent(EVENT_DEBILITATING_STRIKE, 15000); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (killer->GetTypeId() == TYPEID_PLAYER) if (killer->ToPlayer()->GetQuestRewardStatus(QUEST_INTO_THE_SOULGRINDER)) Talk(SAY_DEATH); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || (!who->IsAlive())) return; @@ -155,7 +155,7 @@ public: } } - void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE + void MovementInform(uint32 /*type*/, uint32 id) override { if (id == 1) { @@ -173,7 +173,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -211,7 +211,7 @@ public: bool hp30; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_bloodmaul_bruteAI(creature); } @@ -260,7 +260,7 @@ public: uint32 ManaBurn_Timer; uint32 IntangiblePresence_Timer; - void Reset() OVERRIDE + void Reset() override { IsNihil = false; NihilSpeech_Timer = 3000; @@ -271,9 +271,9 @@ public: IntangiblePresence_Timer = 15000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -283,7 +283,7 @@ public: } //in case Creature was not summoned (not expected) - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -296,7 +296,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (spell->Id == SPELL_T_PHASE_MODULATOR && caster->GetTypeId() == TYPEID_PLAYER) { @@ -327,7 +327,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsNihil) { @@ -392,7 +392,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nether_drakeAI(creature); } @@ -418,11 +418,11 @@ public: { npc_daranelleAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) @@ -439,7 +439,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_daranelleAI(creature); } @@ -468,7 +468,7 @@ class go_legion_obelisk : public GameObjectScript public: go_legion_obelisk() : GameObjectScript("go_legion_obelisk") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (player->GetQuestStatus(QUEST_YOURE_FIRED) == QUEST_STATUS_INCOMPLETE) { @@ -522,7 +522,7 @@ class go_thunderspike : public GameObjectScript public: go_thunderspike() : GameObjectScript("go_thunderspike") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (player->GetQuestStatus(QUEST_THUNDERSPIKE) == QUEST_STATUS_INCOMPLETE && !go->FindNearestCreature(NPC_GOR_GRIMGUT, 25.0f, true)) if (Creature* gorGrimgut = go->SummonCreature(NPC_GOR_GRIMGUT, -2413.4f, 6914.48f, 25.01f, 3.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000)) @@ -624,7 +624,7 @@ class npc_simon_bunny : public CreatureScript EventMap _events; std::list<uint8> colorSequence, playableSequence, playerSequence; - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -678,7 +678,7 @@ class npc_simon_bunny : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -704,7 +704,7 @@ class npc_simon_bunny : public CreatureScript } // Called by color clusters script (go_simon_cluster) and used for knowing the button pressed by player - void SetData(uint32 type, uint32 /*data*/) OVERRIDE + void SetData(uint32 type, uint32 /*data*/) override { if (!listening) return; @@ -727,7 +727,7 @@ class npc_simon_bunny : public CreatureScript } // Used for getting involved player guid. Parameter id is used for defining if is a large(Monument) or small(Relic) node - void SetGUID(uint64 guid, int32 id) OVERRIDE + void SetGUID(uint64 guid, int32 id) override { me->SetCanFly(true); @@ -1017,7 +1017,7 @@ class npc_simon_bunny : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* spell) override { // Cast SPELL_BAD_PRESS_DAMAGE with scaled basepoints when the visual hits the target. // Need Fix: When SPELL_BAD_PRESS_TRIGGER hits target it triggers spell SPELL_BAD_PRESS_DAMAGE by itself @@ -1049,7 +1049,7 @@ class npc_simon_bunny : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_simon_bunnyAI(creature); } @@ -1060,7 +1060,7 @@ class go_simon_cluster : public GameObjectScript public: go_simon_cluster() : GameObjectScript("go_simon_cluster") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (Creature* bunny = go->FindNearestCreature(NPC_SIMON_BUNNY, 12.0f, true)) bunny->AI()->SetData(go->GetEntry(), 0); @@ -1086,14 +1086,14 @@ class go_apexis_relic : public GameObjectScript public: go_apexis_relic() : GameObjectScript("go_apexis_relic") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { player->PrepareGossipMenu(go, go->GetGOInfo()->questgiver.gossipID); player->SendPreparedGossip(go); 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->CLOSE_GOSSIP_MENU(); @@ -1135,7 +1135,7 @@ public: timer = 500; } - void Reset() OVERRIDE + void Reset() override { if (GetClosestCreatureWithEntry(me, NPC_OSCILLATING_FREQUENCY_SCANNER_TOP_BUNNY, 25.0f)) me->DespawnOrUnsummon(); @@ -1150,13 +1150,13 @@ public: timer = 500; } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { if (summoner->isType(TYPEMASK_PLAYER)) playerGuid = summoner->GetGUID(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (timer <= diff) { @@ -1174,7 +1174,7 @@ public: uint32 timer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_oscillating_frequency_scanner_master_bunnyAI(creature); } @@ -1196,13 +1196,13 @@ class spell_oscillating_field : public SpellScriptLoader player->CompleteQuest(QUEST_GAUGING_THE_RESONANT_FREQUENCY); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_oscillating_field_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_oscillating_field_SpellScript(); } diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 3736994e9a3..7b9b2be4674 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -60,7 +60,7 @@ public: { npc_aeranasAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { faction_Timer = 8000; envelopingWinds_Timer = 9000; @@ -72,7 +72,7 @@ public: Talk(SAY_SUMMON); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (faction_Timer) { @@ -118,7 +118,7 @@ public: uint32 shock_Timer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_aeranasAI(creature); } @@ -155,13 +155,13 @@ public: Reset(); } - void Reset() OVERRIDE + void Reset() override { ryga = NULL; DoCast(me, SPELL_ANCESTRAL_WOLF_BUFF, true); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!ryga && who->GetEntry() == NPC_RYGA && me->IsWithinDistInMap(who, 15.0f)) @@ -171,7 +171,7 @@ public: npc_escortAI::MoveInLineOfSight(who); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -192,7 +192,7 @@ public: Creature* ryga; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ancestral_wolfAI(creature); } @@ -225,15 +225,15 @@ public: { npc_wounded_blood_elfAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) Talk(SAY_ELF_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } @@ -247,7 +247,7 @@ public: } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -282,7 +282,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_wounded_blood_elfAI(creature); } @@ -307,13 +307,13 @@ public: { npc_fel_guard_houndAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { checkTimer = 5000; //check for creature every 5 sec helboarGUID = 0; } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE || id != 1) return; @@ -328,7 +328,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (checkTimer <= diff) { @@ -355,7 +355,7 @@ public: uint64 helboarGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fel_guard_houndAI(creature); } diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 9b7a3f8aa2a..3b9d865cb3b 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -60,7 +60,7 @@ class npc_greatmother_geyah : public CreatureScript public: npc_greatmother_geyah() : CreatureScript("npc_greatmother_geyah") { } - 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) @@ -121,7 +121,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()); @@ -178,7 +178,7 @@ class npc_maghar_captive : public CreatureScript public: npc_maghar_captive() : CreatureScript("npc_maghar_captive") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_H) { @@ -197,7 +197,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_maghar_captiveAI(creature); } @@ -210,19 +210,19 @@ public: uint32 HealTimer; uint32 FrostShockTimer; - void Reset() OVERRIDE + void Reset() override { ChainLightningTimer = 1000; HealTimer = 0; FrostShockTimer = 6000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_EARTHBIND_TOTEM, false); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -234,7 +234,7 @@ public: } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -259,7 +259,7 @@ public: } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_MURK_BRUTE) summoned->AI()->Talk(SAY_MAG_NO_ESCAPE); @@ -273,7 +273,7 @@ public: } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override { if (spell->Id == SPELL_CHAIN_LIGHTNING) { @@ -284,7 +284,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -335,7 +335,7 @@ class npc_creditmarker_visit_with_ancestors : public CreatureScript public: npc_creditmarker_visit_with_ancestors() : CreatureScript("npc_creditmarker_visit_with_ancestors") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_creditmarker_visit_with_ancestorsAI(creature); } @@ -344,11 +344,11 @@ public: { npc_creditmarker_visit_with_ancestorsAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who) @@ -399,7 +399,7 @@ class go_corkis_prison : public GameObjectScript public: go_corkis_prison() : GameObjectScript("go_corkis_prison") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->SetGoState(GO_STATE_READY); if (go->GetEntry() == GO_CORKIS_PRISON) @@ -440,7 +440,7 @@ class npc_corki : public CreatureScript public: npc_corki() : CreatureScript("npc_corki") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_corkiAI(creature); } @@ -452,13 +452,13 @@ public: uint32 Say_Timer; bool ReleasedFromCage; - void Reset() OVERRIDE + void Reset() override { Say_Timer = 5000; ReleasedFromCage = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (ReleasedFromCage) { @@ -472,7 +472,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == 1) { @@ -524,7 +524,7 @@ class npc_kurenai_captive : public CreatureScript public: npc_kurenai_captive() : CreatureScript("npc_kurenai_captive") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_A) { @@ -543,7 +543,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kurenai_captiveAI(creature); } @@ -556,19 +556,19 @@ public: uint32 HealTimer; uint32 FrostShockTimer; - void Reset() OVERRIDE + void Reset() override { ChainLightningTimer = 1000; HealTimer = 0; FrostShockTimer = 6000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_KUR_EARTHBIND_TOTEM, false); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -580,7 +580,7 @@ public: } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -609,7 +609,7 @@ public: } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_KUR_MURK_BRUTE) Talk(SAY_KUR_NO_ESCAPE); @@ -623,7 +623,7 @@ public: summoned->AI()->AttackStart(me); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override { if (spell->Id == SPELL_KUR_CHAIN_LIGHTNING) { @@ -642,7 +642,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -695,7 +695,7 @@ class go_warmaul_prison : public GameObjectScript public: go_warmaul_prison() : GameObjectScript("go_warmaul_prison") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_FINDING_THE_SURVIVORS) != QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 8542b32d631..8fac7853f26 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -74,7 +74,7 @@ class npc_manaforge_control_console : public CreatureScript public: npc_manaforge_control_console() : CreatureScript("npc_manaforge_control_console") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_manaforge_control_consoleAI(creature); } @@ -91,7 +91,7 @@ public: uint64 goConsole; Creature* add; - void Reset() OVERRIDE + void Reset() override { Event_Timer = 3000; Wave_Timer = 0; @@ -102,9 +102,9 @@ public: add = NULL; } - 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 { //we have no way of telling the Creature was hit by spell -> got aura applied after 10-12 seconds //then no way for the mobs to actually stop the shutdown as intended. @@ -112,7 +112,7 @@ public: DoSay("Silence! I kill you!", LANG_UNIVERSAL, NULL); }*/ - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(EMOTE_ABORT); @@ -234,7 +234,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Event_Timer <= diff) { @@ -311,7 +311,7 @@ class go_manaforge_control_console : public GameObjectScript public: go_manaforge_control_console() : GameObjectScript("go_manaforge_control_console") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -393,7 +393,7 @@ class npc_commander_dawnforge : public CreatureScript public: npc_commander_dawnforge() : CreatureScript("npc_commander_dawnforge") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_commander_dawnforgeAI(creature); } @@ -411,7 +411,7 @@ public: uint32 Phase_Timer; bool isEvent; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; ardonisGUID = 0; @@ -423,9 +423,9 @@ public: isEvent = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { pathaleonGUID = summoned->GetGUID(); } @@ -488,7 +488,7 @@ public: return false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Is event even running? if (!isEvent) @@ -626,7 +626,7 @@ class at_commander_dawnforge : public AreaTriggerScript public: at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { //if player lost aura or not have at all, we should not try start event. if (!player->HasAura(SPELL_SUNFURY_DISGUISE)) @@ -669,7 +669,7 @@ public: //if (quest->GetQuestId() == QUEST_DIMENSIUS) //creature->AI()->Talk(WHISPER_DABIRI, player); - 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) @@ -681,7 +681,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()); @@ -721,7 +721,7 @@ class npc_phase_hunter : public CreatureScript public: npc_phase_hunter() : CreatureScript("npc_phase_hunter") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_phase_hunterAI(creature); } @@ -747,7 +747,7 @@ public: uint32 ManaBurnTimer; - void Reset() OVERRIDE + void Reset() override { Weak = false; Materialize = false; @@ -762,18 +762,18 @@ public: me->UpdateEntry(NPC_PHASE_HUNTER_ENTRY); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) PlayerGUID = who->GetGUID(); } - //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) OVERRIDE + //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) override //{ // DoCast(me, SPELL_DE_MATERIALIZE); //} - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Materialize) { @@ -854,7 +854,7 @@ class npc_bessy : public CreatureScript public: npc_bessy() : CreatureScript("npc_bessy") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == Q_ALMABTRIEB) { @@ -865,7 +865,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_bessyAI(creature); } @@ -874,13 +874,13 @@ public: { npc_bessyAI(Creature* creature) : npc_escortAI(creature) { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* player = GetPlayerForEscort()) player->FailQuest(Q_ALMABTRIEB); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -909,12 +909,12 @@ public: } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } - void Reset() OVERRIDE + void Reset() override { me->RestoreFaction(); } @@ -936,7 +936,7 @@ class npc_maxx_a_million_escort : public CreatureScript public: npc_maxx_a_million_escort() : CreatureScript("npc_maxx_a_million_escort") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_maxx_a_million_escortAI(creature); } @@ -948,13 +948,13 @@ public: bool bTake; uint32 uiTakeTimer; - void Reset() OVERRIDE + void Reset() override { bTake=false; uiTakeTimer=3000; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -980,13 +980,13 @@ public: } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_MARK_V_IS_ALIVE); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -1010,7 +1010,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_MARK_V_IS_ALIVE) { @@ -1039,7 +1039,7 @@ class go_captain_tyralius_prison : public GameObjectScript public: go_captain_tyralius_prison() : GameObjectScript("go_captain_tyralius_prison") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (Creature* tyralius = go->FindNearestCreature(NPC_CAPTAIN_TYRALIUS, 1.0f)) diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 867eb542dcb..4efa108429a 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -72,7 +72,7 @@ class npc_mature_netherwing_drake : public CreatureScript public: npc_mature_netherwing_drake() : CreatureScript("npc_mature_netherwing_drake") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_mature_netherwing_drakeAI(creature); } @@ -89,7 +89,7 @@ public: uint32 EatTimer; uint32 CastTimer; - void Reset() OVERRIDE + void Reset() override { uiPlayerGUID = 0; @@ -100,7 +100,7 @@ public: CastTimer = 5000; } - void SpellHit(Unit* pCaster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* pCaster, SpellInfo const* spell) override { if (bCanEat || bIsEating) return; @@ -112,7 +112,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -125,7 +125,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (bCanEat || bIsEating) { @@ -210,7 +210,7 @@ class npc_enslaved_netherwing_drake : public CreatureScript public: npc_enslaved_netherwing_drake() : CreatureScript("npc_enslaved_netherwing_drake") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_enslaved_netherwing_drakeAI(creature); } @@ -228,7 +228,7 @@ public: uint32 FlyTimer; bool Tapped; - void Reset() OVERRIDE + void Reset() override { if (!Tapped) me->setFaction(FACTION_DEFAULT); @@ -238,7 +238,7 @@ public: me->SetVisible(true); } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (!caster) return; @@ -264,7 +264,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -286,7 +286,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -341,7 +341,7 @@ class npc_dragonmaw_peon : public CreatureScript public: npc_dragonmaw_peon() : CreatureScript("npc_dragonmaw_peon") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_dragonmaw_peonAI(creature); } @@ -354,14 +354,14 @@ public: bool Tapped; uint32 PoisonTimer; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; Tapped = false; PoisonTimer = 0; } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (!caster) return; @@ -379,7 +379,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -391,7 +391,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (PoisonTimer) { @@ -420,7 +420,7 @@ class npc_drake_dealer_hurlunk : public CreatureScript public: npc_drake_dealer_hurlunk() : CreatureScript("npc_drake_dealer_hurlunk") { } - 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) @@ -429,7 +429,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsVendor() && player->GetReputationRank(1015) == REP_EXALTED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); @@ -452,7 +452,7 @@ class npcs_flanis_swiftwing_and_kagrosh : public CreatureScript public: npcs_flanis_swiftwing_and_kagrosh() : CreatureScript("npcs_flanis_swiftwing_and_kagrosh") { } - 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) @@ -478,7 +478,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(30658, 1, true)) player->ADD_GOSSIP_ITEM(0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -508,7 +508,7 @@ class npc_oronok_tornheart : public CreatureScript public: npc_oronok_tornheart() : CreatureScript("npc_oronok_tornheart") { } - 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) @@ -548,7 +548,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()); @@ -585,7 +585,7 @@ class npc_karynaku : public CreatureScript public: npc_karynaku() : CreatureScript("npc_karynaku") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ALLY_OF_NETHER) player->ActivateTaxiPathTo(TAXI_PATH_ID); @@ -639,7 +639,7 @@ class npc_overlord_morghor : public CreatureScript public: npc_overlord_morghor() : CreatureScript("npc_overlord_morghor") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest *_Quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest *_Quest) override { if (_Quest->GetQuestId() == QUEST_LORD_ILLIDAN_STORMRAGE) { @@ -650,7 +650,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_overlord_morghorAI(creature); } @@ -667,7 +667,7 @@ public: bool Event; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; IllidanGUID = 0; @@ -900,7 +900,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!ConversationTimer) return; @@ -943,7 +943,7 @@ class npc_earthmender_wilda : public CreatureScript public: npc_earthmender_wilda() : CreatureScript("npc_earthmender_wilda") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_ESCAPE_COILSCAR) { @@ -956,7 +956,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_earthmender_wildaAI(creature); } @@ -967,12 +967,12 @@ public: uint32 m_uiHealingTimer; - void Reset() OVERRIDE + void Reset() override { m_uiHealingTimer = 0; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -1030,7 +1030,7 @@ public: } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_COILSKAR_ASSASSIN) summoned->AI()->AttackStart(me); @@ -1048,7 +1048,7 @@ public: DoSummon(NPC_COILSKAR_ASSASSIN, me, 15.0f, 5000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { //don't always use if (rand()%5) @@ -1063,7 +1063,7 @@ public: } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -1186,7 +1186,7 @@ class npc_torloth_the_magnificent : public CreatureScript public: npc_torloth_the_magnificent() : CreatureScript("npc_torloth_the_magnificent") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_torloth_the_magnificentAI(c); } @@ -1204,7 +1204,7 @@ public: bool Timers; - void Reset() OVERRIDE + void Reset() override { AnimationTimer = 4000; AnimationCount = 0; @@ -1217,7 +1217,7 @@ public: me->SetTarget(0); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void HandleAnimation() { @@ -1264,7 +1264,7 @@ public: ++AnimationCount; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (AnimationTimer) { @@ -1309,7 +1309,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { switch (killer->GetTypeId()) { @@ -1341,7 +1341,7 @@ class npc_lord_illidan_stormrage : public CreatureScript public: npc_lord_illidan_stormrage() : CreatureScript("npc_lord_illidan_stormrage") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_lord_illidan_stormrageAI(c); } @@ -1362,7 +1362,7 @@ public: bool Announced; bool Failed; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; @@ -1378,10 +1378,10 @@ public: me->SetVisible(false); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } void SummonNextWave(); @@ -1445,7 +1445,7 @@ public: Announced = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!PlayerGUID || !EventStarted) return; @@ -1483,7 +1483,7 @@ class npc_illidari_spawn : public CreatureScript public: npc_illidari_spawn() : CreatureScript("npc_illidari_spawn") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_illidari_spawnAI(c); } @@ -1496,15 +1496,15 @@ public: uint32 SpellTimer1, SpellTimer2, SpellTimer3; bool Timers; - void Reset() OVERRIDE + void Reset() override { LordIllidanGUID = 0; Timers = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->RemoveCorpse(); if (Creature* LordIllidan = (Unit::GetCreature(*me, LordIllidanGUID))) @@ -1512,7 +1512,7 @@ public: CAST_AI(npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI, LordIllidan->AI())->LiveCounter(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1669,7 +1669,7 @@ class go_crystal_prison : public GameObjectScript public: go_crystal_prison() : GameObjectScript("go_crystal_prison") { } - bool OnQuestAccept(Player* player, GameObject* /*go*/, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, GameObject* /*go*/, Quest const* quest) override { if (quest->GetQuestId() == QUEST_BATTLE_OF_THE_CRIMSON_WATCH) { @@ -1738,7 +1738,7 @@ class npc_enraged_spirit : public CreatureScript public: npc_enraged_spirit() : CreatureScript("npc_enraged_spirit") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_enraged_spiritAI(creature); } @@ -1747,11 +1747,11 @@ public: { npc_enraged_spiritAI(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 { // always spawn spirit on death // if totem around @@ -1833,13 +1833,13 @@ class spell_unlocking_zuluheds_chains : public SpellScriptLoader GetCaster()->ToPlayer()->KilledMonsterCredit(NPC_KARYNAKU, karynaku->GetGUID()); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_unlocking_zuluheds_chains_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_unlocking_zuluheds_chains_SpellScript(); } @@ -1867,14 +1867,14 @@ public: { npc_shadowmoon_tuber_nodeAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { tapped = false; tuberGUID = 0; resetTimer = 60000; } - void SetData(uint32 id, uint32 data) OVERRIDE + void SetData(uint32 id, uint32 data) override { if (id == TYPE_BOAR && data == DATA_BOAR) { @@ -1891,7 +1891,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (!tapped && spell->Id == SPELL_WHISTLE) { @@ -1905,7 +1905,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (tapped) { @@ -1929,7 +1929,7 @@ public: uint32 resetTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_shadowmoon_tuber_nodeAI(creature); } diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index a5cdb600311..9a62cde005c 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -58,7 +58,7 @@ class npc_raliq_the_drunk : public CreatureScript public: npc_raliq_the_drunk() : CreatureScript("npc_raliq_the_drunk") { } - 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) @@ -70,7 +70,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_RALIQ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -79,7 +79,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_raliq_the_drunkAI(creature); } @@ -94,13 +94,13 @@ public: uint32 m_uiNormFaction; uint32 Uppercut_Timer; - void Reset() OVERRIDE + void Reset() override { Uppercut_Timer = 5000; me->RestoreFaction(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -139,7 +139,7 @@ class npc_salsalabim : public CreatureScript public: npc_salsalabim() : CreatureScript("npc_salsalabim") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_10004) == QUEST_STATUS_INCOMPLETE) { @@ -155,7 +155,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_salsalabimAI(creature); } @@ -166,13 +166,13 @@ public: uint32 MagneticPull_Timer; - void Reset() OVERRIDE + void Reset() override { MagneticPull_Timer = 15000; me->RestoreFaction(); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetTypeId() == TYPEID_PLAYER && me->HealthBelowPctDamaged(20, damage)) { @@ -182,7 +182,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -214,7 +214,7 @@ class npc_shattrathflaskvendors : public CreatureScript public: npc_shattrathflaskvendors() : CreatureScript("npc_shattrathflaskvendors") { } - 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) @@ -223,7 +223,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->GetEntry() == 23484) { @@ -268,7 +268,7 @@ class npc_zephyr : public CreatureScript public: npc_zephyr() : CreatureScript("npc_zephyr") { } - 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) @@ -277,7 +277,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetReputationRank(989) >= REP_REVERED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HZ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -323,7 +323,7 @@ class npc_kservant : public CreatureScript public: npc_kservant() : CreatureScript("npc_kservant") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kservantAI(creature); } @@ -333,7 +333,7 @@ public: public: npc_kservantAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -411,7 +411,7 @@ public: } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) @@ -428,7 +428,7 @@ public: } } - void Reset() OVERRIDE { } + void Reset() override { } }; }; @@ -444,7 +444,7 @@ class npc_ishanah : public CreatureScript public: npc_ishanah() : CreatureScript("npc_ishanah") { } - 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) @@ -455,7 +455,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()); @@ -485,7 +485,7 @@ class npc_khadgar : public CreatureScript public: npc_khadgar() : CreatureScript("npc_khadgar") { } - 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) @@ -522,7 +522,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/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index 3fb106e8cd8..a902bd49154 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -61,7 +61,7 @@ class npc_unkor_the_ruthless : public CreatureScript public: npc_unkor_the_ruthless() : CreatureScript("npc_unkor_the_ruthless") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_unkor_the_ruthlessAI(creature); } @@ -74,7 +74,7 @@ public: uint32 UnkorUnfriendly_Timer; uint32 Pulverize_Timer; - void Reset() OVERRIDE + void Reset() override { CanDoQuest = false; UnkorUnfriendly_Timer = 0; @@ -83,7 +83,7 @@ public: me->setFaction(FACTION_HOSTILE); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void DoNice() { @@ -96,7 +96,7 @@ public: UnkorUnfriendly_Timer = 60000; } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { Player* player = done_by->ToPlayer(); @@ -126,7 +126,7 @@ public: } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CanDoQuest) { @@ -168,7 +168,7 @@ class npc_infested_root_walker : public CreatureScript public: npc_infested_root_walker() : CreatureScript("npc_infested_root_walker") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_infested_root_walkerAI(creature); } @@ -177,10 +177,10 @@ public: { npc_infested_root_walkerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by && done_by->GetTypeId() == TYPEID_PLAYER) if (me->GetHealth() <= damage) @@ -199,7 +199,7 @@ class npc_skywing : public CreatureScript public: npc_skywing() : CreatureScript("npc_skywing") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_skywingAI(creature); } @@ -209,7 +209,7 @@ public: public: npc_skywingAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -223,9 +223,9 @@ public: } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) @@ -237,9 +237,9 @@ public: Start(false, false, who->GetGUID()); } - void Reset() OVERRIDE { } + void Reset() override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); } @@ -255,7 +255,7 @@ class npc_rotting_forest_rager : public CreatureScript public: npc_rotting_forest_rager() : CreatureScript("npc_rotting_forest_rager") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_rotting_forest_ragerAI(creature); } @@ -264,10 +264,10 @@ public: { npc_rotting_forest_ragerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetTypeId() == TYPEID_PLAYER) if (me->GetHealth() <= damage) @@ -298,7 +298,7 @@ class npc_netherweb_victim : public CreatureScript public: npc_netherweb_victim() : CreatureScript("npc_netherweb_victim") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_netherweb_victimAI(creature); } @@ -307,12 +307,12 @@ public: { npc_netherweb_victimAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { Player* player = killer->ToPlayer(); if (!player) @@ -361,7 +361,7 @@ class npc_floon : public CreatureScript public: npc_floon() : CreatureScript("npc_floon") { } - 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) @@ -379,7 +379,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -388,7 +388,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_floonAI(creature); } @@ -405,7 +405,7 @@ public: uint32 Frostbolt_Timer; uint32 FrostNova_Timer; - void Reset() OVERRIDE + void Reset() override { Silence_Timer = 2000; Frostbolt_Timer = 4000; @@ -414,9 +414,9 @@ public: me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -469,7 +469,7 @@ public: { npc_isla_starmaneAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -508,12 +508,12 @@ public: } } - void Reset() OVERRIDE + void Reset() override { me->RestoreFaction(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* player = GetPlayerForEscort()) { @@ -525,7 +525,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_EFTW_H || quest->GetQuestId() == QUEST_EFTW_A) { @@ -535,7 +535,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_isla_starmaneAI(creature); } @@ -554,7 +554,7 @@ class go_skull_pile : public GameObjectScript public: go_skull_pile() : GameObjectScript("go_skull_pile") { } - 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(); switch (sender) @@ -564,7 +564,7 @@ public: return true; } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if ((player->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) || player->GetQuestRewardStatus(11885)) { @@ -612,7 +612,7 @@ class npc_slim : public CreatureScript public: npc_slim() : CreatureScript("npc_slim") { } - 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) @@ -621,7 +621,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsVendor() && player->GetReputationRank(FACTION_CONSORTIUM) >= REP_FRIENDLY) { @@ -650,7 +650,7 @@ class npc_akuno : public CreatureScript public: npc_akuno() : CreatureScript("npc_akuno") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ESCAPING_THE_TOMB) { @@ -665,7 +665,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_akunoAI(creature); } @@ -674,7 +674,7 @@ public: { npc_akunoAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -693,7 +693,7 @@ public: } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summon->AI()->AttackStart(me); } diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index f8ef3d7c3bd..b9736c523c3 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -69,7 +69,7 @@ class npcs_ashyen_and_keleth : public CreatureScript public: npcs_ashyen_and_keleth() : CreatureScript("npcs_ashyen_and_keleth") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetReputationRank(942) > REP_NEUTRAL) { @@ -84,7 +84,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(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -183,16 +183,16 @@ public: uint32 m_uiNormFaction; uint32 LightningBolt_Timer; - void Reset() OVERRIDE + void Reset() override { LightningBolt_Timer = 2000; if (me->getFaction() != m_uiNormFaction) me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -207,12 +207,12 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_cooshcooshAI(creature); } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_COOSH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -221,7 +221,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(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -247,7 +247,7 @@ class npc_elder_kuruti : public CreatureScript public: npc_elder_kuruti() : CreatureScript("npc_elder_kuruti") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(9803) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -257,7 +257,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(); switch (action) @@ -300,7 +300,7 @@ class npc_mortog_steamhead : public CreatureScript public: npc_mortog_steamhead() : CreatureScript("npc_mortog_steamhead") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsVendor() && player->GetReputationRank(942) == REP_EXALTED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); @@ -310,7 +310,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(); if (action == GOSSIP_ACTION_TRADE) @@ -344,9 +344,9 @@ public: { npc_kayra_longmaneAI(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) @@ -379,7 +379,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_FROM) { @@ -391,7 +391,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kayra_longmaneAI(creature); } @@ -414,7 +414,7 @@ class npc_timothy_daniels : public CreatureScript public: npc_timothy_daniels() : CreatureScript("npc_timothy_daniels") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -427,7 +427,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(); switch (action) |