diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-07-06 20:21:45 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-07-06 20:21:45 +0100 |
| commit | 3561ab98bae1dc111530223aaf25f58bb3267677 (patch) | |
| tree | 93cd9c541564b8469f617871dd51407609f3dee7 /src/server/scripts/Outland | |
| parent | 0c911af24c263c4e931c7264242c9755074d270d (diff) | |
Misc: Use override and final C++11 keywords in a few places (mostly scripts)
OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not support C++11)
Diffstat (limited to 'src/server/scripts/Outland')
82 files changed, 1236 insertions, 1183 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 8e6741ab9af..becf30e1210 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_stolen_soulAI (creature); } @@ -66,12 +66,12 @@ public: uint8 myClass; uint32 Class_Timer; - void Reset() + void Reset() OVERRIDE { Class_Timer = 1000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SetMyClass(uint8 myclass) @@ -79,7 +79,7 @@ public: myClass = myclass; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -156,7 +156,7 @@ class boss_exarch_maladaar : public CreatureScript public: boss_exarch_maladaar() : CreatureScript("boss_exarch_maladaar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_exarch_maladaarAI (creature); } @@ -179,7 +179,7 @@ public: bool HasTaunted; bool Avatar_summoned; - void Reset() + void Reset() OVERRIDE { soulmodel = 0; soulholder = 0; @@ -192,7 +192,8 @@ public: Avatar_summoned = false; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!HasTaunted && me->IsWithinDistInMap(who, 150.0f)) { @@ -203,12 +204,12 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == ENTRY_STOLEN_SOUL) { @@ -226,7 +227,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (rand()%2) return; @@ -234,14 +235,14 @@ public: Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + 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) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -306,7 +307,7 @@ class npc_avatar_of_martyred : public CreatureScript public: npc_avatar_of_martyred() : CreatureScript("npc_avatar_of_martyred") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_avatar_of_martyredAI (creature); } @@ -317,16 +318,16 @@ public: uint32 Mortal_Strike_timer; - void Reset() + void Reset() OVERRIDE { Mortal_Strike_timer = 10000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + 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 daa8d68a292..86eb9e33a7e 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_shirrak_the_dead_watcherAI (creature); } @@ -71,7 +71,7 @@ public: uint64 FocusedTargetGUID; - void Reset() + void Reset() OVERRIDE { Inhibitmagic_Timer = 0; Attractmagic_Timer = 28000; @@ -80,10 +80,10 @@ public: FocusedTargetGUID = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned && summoned->GetEntry() == NPC_FOCUS_FIRE) { @@ -97,7 +97,7 @@ public: } } - void UpdateAI(uint32 diff) + 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 + 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() + void Reset() OVERRIDE { FieryBlast_Timer = 3000+(rand()%1000); fiery1 = fiery2 = true; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) 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 5b603984ea4..ee315d1d42b 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_nexusprince_shaffarAI (creature); } @@ -91,7 +91,7 @@ public: bool HasTaunted; bool CanBlink; - void Reset() + void Reset() OVERRIDE { Blink_Timer = 1500; Beacon_Timer = 10000; @@ -110,13 +110,14 @@ public: me->SummonCreature(NPC_BEACON, posX + dist, posY, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { summons.DespawnAll(); ScriptedAI::EnterEvadeMode(); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!HasTaunted && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 100.0f)) { @@ -125,7 +126,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -133,7 +134,7 @@ public: summons.DoZoneInCombat(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_BEACON) { @@ -146,23 +147,23 @@ public: summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { summons.Despawn(summon); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEAD); summons.DespawnAll(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -231,7 +232,7 @@ class npc_ethereal_beacon : public CreatureScript public: npc_ethereal_beacon() : CreatureScript("npc_ethereal_beacon") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ethereal_beaconAI (creature); } @@ -251,14 +252,14 @@ public: me->Kill(me); } - void Reset() + void Reset() OVERRIDE { Apprentice_Timer = DUNGEON_MODE(20000, 10000); ArcaneBolt_Timer = 1000; Check_Timer = 1000; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { // Send Shaffar to fight Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); @@ -271,12 +272,12 @@ public: Shaffar->AI()->AttackStart(who); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me->GetVictim()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -323,7 +324,7 @@ class npc_ethereal_apprentice : public CreatureScript public: npc_ethereal_apprentice() : CreatureScript("npc_ethereal_apprentice") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ethereal_apprenticeAI (creature); } @@ -336,13 +337,13 @@ public: bool isFireboltTurn; - void Reset() + void Reset() OVERRIDE { Cast_Timer = 3000; isFireboltTurn = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index e4d8d959941..aa24e964df9 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_pandemoniusAI (creature); } @@ -60,29 +60,29 @@ public: uint32 DarkShell_Timer; uint32 VoidBlast_Counter; - void Reset() + void Reset() OVERRIDE { VoidBlast_Timer = 8000+rand()%15000; DarkShell_Timer = 20000; VoidBlast_Counter = 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; 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 a70c3a1e7f4..3ba2fd9d19a 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -56,7 +56,7 @@ class boss_darkweaver_syth : public CreatureScript public: boss_darkweaver_syth() : CreatureScript("boss_darkweaver_syth") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_darkweaver_sythAI (creature); } @@ -77,7 +77,7 @@ public: bool summon50; bool summon10; - void Reset() + void Reset() OVERRIDE { flameshock_timer = 2000; arcaneshock_timer = 4000; @@ -90,17 +90,17 @@ public: summon10 = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (rand()%2) return; @@ -108,7 +108,7 @@ public: Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(target); @@ -127,7 +127,7 @@ public: DoCast(me, SPELL_SUMMON_SYTH_SHADOW, true); //right } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -211,16 +211,16 @@ public: uint32 flameshock_timer; uint32 flamebuffet_timer; - void Reset() + void Reset() OVERRIDE { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); flameshock_timer = 2500; flamebuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -245,7 +245,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_syth_fireAI (creature); } @@ -256,7 +256,7 @@ class npc_syth_arcane : public CreatureScript public: npc_syth_arcane() : CreatureScript("npc_syth_arcane") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_syth_arcaneAI (creature); } @@ -270,16 +270,16 @@ public: uint32 arcaneshock_timer; uint32 arcanebuffet_timer; - void Reset() + void Reset() OVERRIDE { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, true); arcaneshock_timer = 2500; arcanebuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -310,7 +310,7 @@ class npc_syth_frost : public CreatureScript public: npc_syth_frost() : CreatureScript("npc_syth_frost") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_syth_frostAI (creature); } @@ -324,16 +324,16 @@ public: uint32 frostshock_timer; uint32 frostbuffet_timer; - void Reset() + void Reset() OVERRIDE { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); frostshock_timer = 2500; frostbuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -365,7 +365,7 @@ class npc_syth_shadow : public CreatureScript public: npc_syth_shadow() : CreatureScript("npc_syth_shadow") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_syth_shadowAI (creature); } @@ -379,16 +379,16 @@ public: uint32 shadowshock_timer; uint32 shadowbuffet_timer; - void Reset() + void Reset() OVERRIDE { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true); shadowshock_timer = 2500; shadowbuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + 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 b9a2fc62e8e..9333f19d41a 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -53,7 +53,7 @@ class boss_talon_king_ikiss : public CreatureScript public: boss_talon_king_ikiss() : CreatureScript("boss_talon_king_ikiss") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_talon_king_ikissAI (creature); } @@ -76,7 +76,7 @@ public: bool Blink; bool Intro; - void Reset() + void Reset() OVERRIDE { ArcaneVolley_Timer = 5000; Sheep_Timer = 8000; @@ -87,7 +87,8 @@ public: ManaShield = false; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!me->GetVictim() && me->CanCreatureAttack(who)) { @@ -109,12 +110,12 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -122,12 +123,12 @@ public: instance->SetData(DATA_IKISSDOOREVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; 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 a9091075075..d44789f4c39 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -42,7 +42,7 @@ class instance_sethekk_halls : public InstanceMapScript public: instance_sethekk_halls() : InstanceMapScript("instance_sethekk_halls", 556) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_sethekk_halls_InstanceMapScript(map); } @@ -77,7 +77,7 @@ public: m_uiIkissDoorGUID = go->GetGUID(); } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { 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 c7477171710..ffadfccecfe 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -50,7 +50,7 @@ class boss_ambassador_hellmaw : public CreatureScript public: boss_ambassador_hellmaw() : CreatureScript("boss_ambassador_hellmaw") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ambassador_hellmawAI(creature); } @@ -72,7 +72,7 @@ public: bool IsBanished; bool Enraged; - void Reset() + void Reset() OVERRIDE { EventCheck_Timer = 5000; CorrosiveAcid_Timer = urand(5000, 10000); @@ -89,13 +89,14 @@ public: } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) instance->SetData(TYPE_HELLMAW, FAIL); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->HasAura(SPELL_BANISH)) return; @@ -103,7 +104,7 @@ public: npc_escortAI::MoveInLineOfSight(who); } - void WaypointReached(uint32 /*waypointId*/) + void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } @@ -127,17 +128,17 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -145,7 +146,7 @@ public: instance->SetData(TYPE_HELLMAW, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Intro && !HasEscortState(STATE_ESCORT_ESCORTING)) { 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 307e8c8a2c6..573acfce5c2 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 @@ -65,7 +65,7 @@ public: { boss_blackheart_the_inciterAI(Creature* creature) : BossAI(creature, DATA_BLACKHEARTTHEINCITEREVENT) { } - void Reset() + void Reset() OVERRIDE { InciteChaos = false; @@ -73,12 +73,12 @@ public: instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -86,7 +86,7 @@ public: instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_INCITE_CHAOS_WAIT, 15000); events.ScheduleEvent(EVENT_INCITE_CHAOS, 20000); @@ -99,7 +99,7 @@ public: instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -150,13 +150,12 @@ public: private: bool InciteChaos; - - CreatureAI* GetAI(Creature* creature) const - { - return new boss_blackheart_the_inciterAI (creature); - } }; + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new boss_blackheart_the_inciterAI(creature); + } }; void AddSC_boss_blackheart_the_inciter() 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 115c75c2f17..088913b13d2 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -84,16 +84,16 @@ public: uint32 move; bool sacrificed; - void Reset() + void Reset() OVERRIDE { VorpilGUID = 0; move = 0; sacrificed = false; } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!VorpilGUID) { @@ -133,13 +133,12 @@ public: move = 1000; } else move -= diff; } - - CreatureAI* GetAI(Creature* creature) const - { - return new npc_voidtravelerAI (creature); - } }; + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new npc_voidtravelerAI(creature); + } }; class boss_grandmaster_vorpil : public CreatureScript @@ -154,7 +153,7 @@ public: Intro = false; } - void Reset() + void Reset() OVERRIDE { HelpYell = false; sumportals = false; @@ -209,18 +208,18 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned && summoned->GetEntry() == NPC_VOID_TRAVELER) CAST_AI(npc_voidtraveler::npc_voidtravelerAI, summoned->AI())->VorpilGUID = me->GetGUID(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); destroyPortals(); @@ -229,7 +228,7 @@ public: instance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, urand(7000, 14000)); if (IsHeroic()) @@ -245,7 +244,8 @@ public: _EnterCombat(); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { ScriptedAI::MoveInLineOfSight(who); @@ -256,7 +256,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -312,12 +312,13 @@ public: bool sumportals; uint64 PortalsGuid[5]; - CreatureAI* GetAI(Creature* creature) const - { - return new boss_grandmaster_vorpilAI (creature); - } + }; + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new boss_grandmaster_vorpilAI(creature); + } }; void AddSC_boss_grandmaster_vorpil() diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 4f1d93aa04e..99078b3b15d 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 @@ public: SetCombatMovement(false); } - void Reset() + void Reset() OVERRIDE { events.ScheduleEvent(EVENT_SONIC_BOOM, 30000); events.ScheduleEvent(EVENT_MURMURS_TOUCH, urand(8000, 20000)); @@ -100,16 +100,16 @@ public: } } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} // Sonic Boom instant damage (needs core fix instead of this) - void SpellHitTarget(Unit* target, const SpellInfo* spell) + void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE { if (target && target->IsAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT)) me->DealDamage(target, (target->GetHealth()*90)/100, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NATURE, spell); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target or casting if (!UpdateVictim() || me->IsNonMeleeSpellCasted(false)) @@ -188,12 +188,12 @@ public: DoMeleeAttackIfReady(); } - - CreatureAI* GetAI(Creature* creature) const - { - return new boss_murmurAI (creature); - } }; + + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new boss_murmurAI(creature); + } }; void AddSC_boss_murmur() 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 e3dec9c0a45..6e579003262 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -39,7 +39,7 @@ class instance_shadow_labyrinth : public InstanceMapScript public: instance_shadow_labyrinth() : InstanceMapScript("instance_shadow_labyrinth", 555) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_shadow_labyrinth_InstanceMapScript(map); } @@ -111,7 +111,7 @@ public: } } - void SetData(uint32 type, uint32 uiData) + void SetData(uint32 type, uint32 uiData) OVERRIDE { switch (type) { @@ -174,7 +174,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -186,7 +186,7 @@ public: return false; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { if (identifier == DATA_GRANDMASTERVORPIL) return m_uiGrandmasterVorpil; diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index 329a8c73927..33a6c42bae7 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -49,7 +49,7 @@ public: { npc_spirit_of_olumAI(Creature* creature) : ScriptedAI(creature) {} - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE { if (action == 1) { @@ -60,7 +60,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spirit_of_olumAI (creature); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index d5db702a9fc..d55ca24914a 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gurtogg_bloodboilAI (creature); } @@ -93,7 +93,7 @@ public: bool Phase1; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_GURTOGGBLOODBOILEVENT, NOT_STARTED); @@ -119,7 +119,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); Talk(SAY_AGGRO); @@ -127,12 +127,12 @@ public: instance->SetData(DATA_GURTOGGBLOODBOILEVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_GURTOGGBLOODBOILEVENT, DONE); @@ -196,7 +196,7 @@ public: } } - void UpdateAI(uint32 diff) + 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 22322625775..07c6e665e98 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -383,14 +383,14 @@ public: { flame_of_azzinothAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { FlameBlastTimer = 15000; CheckTimer = 5000; GlaiveGUID = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } @@ -435,7 +435,7 @@ public: GlaiveGUID = guid; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -464,7 +464,7 @@ public: uint64 GlaiveGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new flame_of_azzinothAI (creature); } @@ -484,11 +484,11 @@ public: DoCast(me, SPELL_DUAL_WIELD, true); } - void Reset(); + void Reset() OVERRIDE; - void JustSummoned(Creature* summon); + void JustSummoned(Creature* summon) OVERRIDE; - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { if (summon->GetCreatureTemplate()->Entry == FLAME_OF_AZZINOTH) { @@ -505,7 +505,7 @@ public: Summons.Despawn(summon); } - void MovementInform(uint32 /*MovementType*/, uint32 /*Data*/) + void MovementInform(uint32 /*MovementType*/, uint32 /*Data*/) OVERRIDE { if (FlightCount == 7) // change hover point { @@ -520,13 +520,13 @@ public: Timer[EVENT_FLIGHT_SEQUENCE] = 1000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->setActive(true); DoZoneInCombat(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || Phase >= PHASE_TALK_SEQUENCE) return; @@ -537,9 +537,10 @@ public: ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit*) {} + void MoveInLineOfSight(Unit*) OVERRIDE {} - void JustDied(Unit* /*killer*/) + + void JustDied(Unit* /*killer*/) OVERRIDE { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -552,7 +553,7 @@ public: instance->HandleGameObject(instance->GetData64(i), true); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -560,7 +561,7 @@ public: Talk(SAY_ILLIDAN_KILL); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && done_by != me) damage = 0; @@ -568,7 +569,7 @@ public: done_by->AddThreat(me, -(3*(float)damage)/4); // do not let maiev tank him } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_GLAIVE_RETURNS) // Re-equip our warblades! { @@ -922,7 +923,7 @@ public: ++TransformCount; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if ((!UpdateVictim()) && Phase < PHASE_TALK_SEQUENCE) return; @@ -1126,7 +1127,7 @@ public: SummonList Summons; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_illidan_stormrageAI (creature); } @@ -1144,7 +1145,7 @@ public: { boss_maievAI(Creature* creature) : ScriptedAI(creature) {}; - void Reset() + void Reset() OVERRIDE { MaxTimer = 0; Phase = PHASE_NORMAL_MAIEV; @@ -1156,16 +1157,17 @@ public: me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, 45738); } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void EnterEvadeMode() {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void EnterEvadeMode() OVERRIDE {} void GetIllidanGUID(uint64 guid) { IllidanGUID = guid; } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by->GetGUID() != IllidanGUID) damage = 0; @@ -1179,7 +1181,7 @@ public: } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || Timer[EVENT_MAIEV_STEALTH]) return; @@ -1197,7 +1199,7 @@ public: ScriptedAI::AttackStart(who); } - void DoAction(int32 param) + void DoAction(int32 param) OVERRIDE { if (param > PHASE_ILLIDAN_NULL && param < PHASE_ILLIDAN_MAX) EnterPhase(PhaseIllidan(param)); @@ -1269,7 +1271,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if ((!UpdateVictim()) && !Timer[EVENT_MAIEV_STEALTH]) @@ -1346,7 +1348,7 @@ public: uint32 MaxTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_maievAI (creature); } @@ -1365,7 +1367,7 @@ public: JustCreated = true; } - void Reset() + void Reset() OVERRIDE { WalkCount = 0; if (instance) @@ -1421,23 +1423,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() + void EnterEvadeMode() OVERRIDE { me->RemoveAllAuras(); me->DeleteThreatList(); me->CombatStop(true); } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void MovementInform(uint32 MovementType, uint32 /*Data*/) + + void MovementInform(uint32 MovementType, uint32 /*Data*/) OVERRIDE { if (MovementType == POINT_MOTION_TYPE) Timer = 1; } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (damage > me->GetHealth() || done_by->GetGUID() != IllidanGUID) damage = 0; @@ -1685,7 +1688,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsVisible()) { @@ -1768,7 +1771,7 @@ public: DoMeleeAttackIfReady(); } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE { player->CLOSE_GOSSIP_MENU(); EnterPhase(PHASE_CHANNEL); @@ -1791,7 +1794,7 @@ public: uint32 Check_Timer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_akama_illidanAI(creature); } @@ -1985,7 +1988,7 @@ public: { cage_trap_triggerAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { IllidanGUID = 0; @@ -1997,9 +2000,10 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!Active) return; @@ -2023,7 +2027,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (DespawnTimer) { @@ -2049,7 +2053,7 @@ public: bool SummonedBeams; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new cage_trap_triggerAI (creature); } @@ -2060,7 +2064,7 @@ class gameobject_cage_trap : public GameObjectScript public: gameobject_cage_trap() : GameObjectScript("gameobject_cage_trap") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { float x, y, z; player->GetPosition(x, y, z); @@ -2082,24 +2086,24 @@ public: { shadow_demonAI(Creature* creature) : ScriptedAI(creature) {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void Reset() + void Reset() OVERRIDE { TargetGUID = 0; DoCast(me, SPELL_SHADOW_DEMON_PASSIVE, true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Unit* target = Unit::GetUnit(*me, TargetGUID)) target->RemoveAurasDueToSpell(SPELL_PARALYZE); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -2123,7 +2127,7 @@ public: uint64 TargetGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new shadow_demonAI (creature); } @@ -2138,14 +2142,14 @@ public: { blade_of_azzinothAI(Creature* creature) : NullCreatureAI(creature) {} - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new blade_of_azzinothAI (creature); } @@ -2164,7 +2168,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { if (instance) IllidanGUID = instance->GetData64(DATA_ILLIDANSTORMRAGE); @@ -2175,7 +2179,7 @@ public: DoCast(me, SPELL_SHADOWFIEND_PASSIVE, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } @@ -2196,7 +2200,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->GetVictim()) { @@ -2230,7 +2234,7 @@ public: uint32 CheckTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new 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 1695c729b86..0bf6685bcf4 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_shahrazAI (creature); } @@ -111,7 +111,7 @@ public: bool Enraged; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_MOTHERSHAHRAZEVENT, NOT_STARTED); @@ -134,7 +134,7 @@ public: Enraged = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_MOTHERSHAHRAZEVENT, IN_PROGRESS); @@ -143,12 +143,12 @@ public: Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_MOTHERSHAHRAZEVENT, DONE); @@ -174,7 +174,7 @@ public: } } - void UpdateAI(uint32 diff) + 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 c2d2c67dc48..e43b80d375d 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_enslaved_soulAI (creature); } @@ -115,15 +115,15 @@ public: uint64 ReliquaryGUID; - void Reset() {ReliquaryGUID = 0;} + void Reset() OVERRIDE { ReliquaryGUID = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, ENSLAVED_SOUL_PASSIVE, true); DoZoneInCombat(); } - void JustDied(Unit* /*killer*/); + 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_reliquary_of_soulsAI (creature); } @@ -156,7 +156,7 @@ public: uint32 SoulCount; uint32 SoulDeathCount; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_RELIQUARYOFSOULSEVENT, NOT_STARTED); @@ -177,7 +177,8 @@ public: me->RemoveAurasDueToSpell(SPELL_SUBMERGE); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who) return; @@ -194,7 +195,7 @@ public: AttackStartNoMove(who); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { me->AddThreat(who, 10000.0f); DoZoneInCombat(); @@ -242,13 +243,13 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_RELIQUARYOFSOULSEVENT, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Phase) return; @@ -387,7 +388,7 @@ class boss_essence_of_suffering : public CreatureScript public: boss_essence_of_suffering() : CreatureScript("boss_essence_of_suffering") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_essence_of_sufferingAI (creature); } @@ -404,7 +405,7 @@ public: uint32 SoulDrainTimer; uint32 AuraTimer; - void Reset() + void Reset() OVERRIDE { StatAuraGUID = 0; @@ -415,7 +416,7 @@ public: AuraTimer = 5000; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth()) { @@ -427,7 +428,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) { @@ -440,7 +441,7 @@ public: else return; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SUFF_SAY_SLAY); } @@ -469,7 +470,7 @@ public: me->AddThreat(target, 1000000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (me->IsInCombat()) { @@ -512,7 +513,7 @@ class boss_essence_of_desire : public CreatureScript public: boss_essence_of_desire() : CreatureScript("boss_essence_of_desire") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_essence_of_desireAI (creature); } @@ -525,7 +526,7 @@ public: uint32 DeadenTimer; uint32 SoulShockTimer; - void Reset() + void Reset() OVERRIDE { RuneShieldTimer = 60000; DeadenTimer = 30000; @@ -533,7 +534,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_CONFUSE, true); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by == me) return; @@ -552,7 +553,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL)) for (uint8 i = 0; i < 3; ++i) @@ -562,19 +563,19 @@ public: me->InterruptSpell(CURRENT_GENERIC_SPELL, false); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(DESI_SAY_FREED); DoZoneInCombat(); DoCast(me, AURA_OF_DESIRE, true); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(DESI_SAY_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -615,7 +616,7 @@ class boss_essence_of_anger : public CreatureScript public: boss_essence_of_anger() : CreatureScript("boss_essence_of_anger") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_essence_of_angerAI (creature); } @@ -634,7 +635,7 @@ public: bool CheckedAggro; - void Reset() + void Reset() OVERRIDE { AggroTargetGUID = 0; @@ -647,7 +648,7 @@ public: CheckedAggro = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(ANGER_SAY_FREED); @@ -655,17 +656,17 @@ public: DoCast(me, AURA_OF_ANGER, true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(ANGER_SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(ANGER_SAY_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) 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 a4779204571..04e08a517e7 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -125,7 +125,7 @@ class npc_ashtongue_channeler : public CreatureScript public: npc_ashtongue_channeler() : CreatureScript("npc_ashtongue_channeler") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ashtongue_channelerAI (creature); } @@ -139,12 +139,13 @@ public: uint64 ShadeGUID; - void Reset() {} - void JustDied(Unit* /*killer*/); - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 /*diff*/) {} + void Reset() OVERRIDE {} + void JustDied(Unit* /*killer*/) OVERRIDE; + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 /*diff*/) OVERRIDE {} }; }; @@ -154,7 +155,7 @@ class npc_ashtongue_sorcerer : public CreatureScript public: npc_ashtongue_sorcerer() : CreatureScript("npc_ashtongue_sorcerer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ashtongue_sorcererAI (creature); } @@ -170,17 +171,18 @@ public: uint32 CheckTimer; bool StartBanishing; - void Reset() + void Reset() OVERRIDE { StartBanishing = false; CheckTimer = 5000; } - void JustDied(Unit* /*killer*/); - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 diff) + void JustDied(Unit* /*killer*/) OVERRIDE; + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 diff) OVERRIDE { if (StartBanishing) return; @@ -212,7 +214,7 @@ class boss_shade_of_akama : public CreatureScript public: boss_shade_of_akama() : CreatureScript("boss_shade_of_akama") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_shade_of_akamaAI (creature); } @@ -249,7 +251,7 @@ public: bool HasKilledAkamaAndReseting; SummonList summons; - void Reset() + void Reset() OVERRIDE { reseting = true; HasKilledAkamaAndReseting = false; @@ -292,24 +294,25 @@ public: reseting = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { summons.DespawnAll(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Despawn(summon); } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { if (!GridSearcherSucceeded) { @@ -340,7 +343,7 @@ public: } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || IsBanished) return; @@ -433,7 +436,7 @@ public: void SetAkamaGUID(uint64 guid) { AkamaGUID = guid; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) return; @@ -564,7 +567,7 @@ class npc_akama_shade : public CreatureScript public: npc_akama_shade() : CreatureScript("npc_akama_shade") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time @@ -576,7 +579,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->IsAlive()) { @@ -587,7 +590,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_akamaAI (creature); } @@ -637,7 +640,7 @@ public: bool HasYelledOnce; SummonList summons; - void Reset() + void Reset() OVERRIDE { DestructivePoisonTimer = 15000; LightningBoltTimer = 10000; @@ -651,19 +654,19 @@ public: summons.DespawnAll(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_BROKEN) summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_BROKEN) summons.Despawn(summon); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void BeginEvent(Player* player) { @@ -693,7 +696,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -716,7 +719,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); EventBegun = false; @@ -736,7 +739,7 @@ public: summons.DespawnAll(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!EventBegun) return; diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index e1da7882b70..806d11a3906 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new molten_flameAI (creature); } @@ -72,7 +72,7 @@ public: { molten_flameAI(Creature* creature) : NullCreatureAI(creature) {} - void InitializeAI() + 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_supremusAI (creature); } @@ -105,7 +105,7 @@ public: SummonList summons; uint32 phase; - void Reset() + void Reset() OVERRIDE { if (instance) { @@ -123,7 +123,7 @@ public: summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_SUPREMUSEVENT, IN_PROGRESS); @@ -160,7 +160,7 @@ public: events.ScheduleEvent(EVENT_SWITCH_PHASE, 60000, GCD_CAST); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -170,12 +170,12 @@ public: summons.DespawnAll(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { summons.Despawn(summon); } @@ -203,7 +203,7 @@ public: return target; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -267,7 +267,7 @@ class npc_volcano : public CreatureScript public: npc_volcano() : CreatureScript("npc_volcano") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_volcanoAI (creature); } @@ -279,7 +279,7 @@ public: SetCombatMovement(false); } - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -289,16 +289,17 @@ public: } uint32 wait; - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void DoAction(int32 /*info*/) + + void DoAction(int32 /*info*/) OVERRIDE { me->RemoveAura(SPELL_VOLCANIC_ERUPTION); } - void UpdateAI(uint32 diff) + 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 14a31e85e24..dc212e69d87 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_doom_blossomAI(creature); } @@ -69,16 +69,17 @@ public: uint32 ShadowBoltTimer; uint64 TeronGUID; - void Reset() + void Reset() OVERRIDE { CheckTeronTimer = 5000; ShadowBoltTimer = 12000; TeronGUID = 0; } - void EnterCombat(Unit* /*who*/) { } - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Despawn() { @@ -86,7 +87,7 @@ public: me->RemoveCorpse(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CheckTeronTimer <= diff) { @@ -124,7 +125,7 @@ class npc_shadowy_construct : public CreatureScript public: npc_shadowy_construct() : CreatureScript("npc_shadowy_construct") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shadowy_constructAI(creature); } @@ -139,7 +140,7 @@ public: uint32 CheckPlayerTimer; uint32 CheckTeronTimer; - void Reset() + void Reset() OVERRIDE { GhostGUID = 0; TeronGUID = 0; @@ -148,9 +149,10 @@ public: CheckTeronTimer = 5000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!who || (!who->IsAlive()) || (who->GetGUID() == GhostGUID)) return; @@ -159,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) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by->GetGUID() != GhostGUID) damage = 0; // Only the ghost can deal damage. @@ -188,7 +190,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CheckPlayerTimer <= diff) { @@ -213,7 +215,7 @@ class boss_teron_gorefiend : public CreatureScript public: boss_teron_gorefiend() : CreatureScript("boss_teron_gorefiend") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_teron_gorefiendAI (creature); } @@ -242,7 +244,7 @@ public: bool Intro; bool Done; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_TERONGOREFIENDEVENT, NOT_STARTED); @@ -264,9 +266,10 @@ public: Done = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!Intro && who->GetTypeId() == TYPEID_PLAYER && me->CanCreatureAttack(who)) { @@ -287,12 +290,12 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_TERONGOREFIENDEVENT, DONE); @@ -378,7 +381,7 @@ public: } } - void UpdateAI(uint32 diff) + 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 2782892db5d..e70acb40556 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_najentusAI (creature); } @@ -93,7 +93,7 @@ public: uint64 SpineTargetGUID; - void Reset() + void Reset() OVERRIDE { events.Reset(); @@ -103,13 +103,13 @@ public: instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); events.DelayEvents(5000, GCD_YELL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, DONE); @@ -117,7 +117,7 @@ public: Talk(SAY_DEATH); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_HURL_SPINE && me->HasAura(SPELL_TIDAL_SHIELD)) { @@ -127,7 +127,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, IN_PROGRESS); @@ -158,7 +158,7 @@ public: events.RescheduleEvent(EVENT_SHIELD, 60000 + inc); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -225,7 +225,7 @@ class go_najentus_spine : public GameObjectScript public: go_najentus_spine() : GameObjectScript("go_najentus_spine") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (InstanceScript* instance = go->GetInstanceScript()) if (Creature* Najentus = Unit::GetCreature(*go, instance->GetData64(DATA_HIGHWARLORDNAJENTUS))) diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index bbf75b2df5c..8b135316704 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 + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_blood_elf_council_voice_triggerAI(c); } @@ -142,7 +142,7 @@ public: bool EventStarted; - void Reset() + void Reset() OVERRIDE { EnrageTimer = 900000; // 15 minutes AggroYellTimer = 500; @@ -164,12 +164,13 @@ public: } else TC_LOG_ERROR(LOG_FILTER_TSCR, ERROR_INST_DATA); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + + void UpdateAI(uint32 diff) OVERRIDE { if (!EventStarted) return; @@ -215,7 +216,7 @@ class npc_illidari_council : public CreatureScript public: npc_illidari_council() : CreatureScript("npc_illidari_council") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_illidari_councilAI (creature); } @@ -240,7 +241,7 @@ public: bool EventBegun; - void Reset() + void Reset() OVERRIDE { CheckTimer = 2000; EndEventTimer = 0; @@ -276,9 +277,10 @@ public: me->SetDisplayId(11686); } - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void StartEvent(Unit* target) { @@ -315,7 +317,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!EventBegun) return; @@ -397,7 +399,7 @@ struct boss_illidari_councilAI : public ScriptedAI bool LoadedGUIDs; - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -420,7 +422,7 @@ struct boss_illidari_councilAI : public ScriptedAI LoadGUIDs(); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { for (uint8 i = 0; i < 4; ++i) { @@ -434,7 +436,7 @@ struct boss_illidari_councilAI : public ScriptedAI ScriptedAI::EnterEvadeMode(); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by == me) return; @@ -473,7 +475,7 @@ class boss_gathios_the_shatterer : public CreatureScript public: boss_gathios_the_shatterer() : CreatureScript("boss_gathios_the_shatterer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gathios_the_shattererAI (creature); } @@ -488,7 +490,7 @@ public: uint32 AuraTimer; uint32 BlessingTimer; - void Reset() + void Reset() OVERRIDE { ConsecrationTimer = 40000; HammerOfJusticeTimer = 10000; @@ -497,12 +499,12 @@ public: BlessingTimer = 60000; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_GATH_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_GATH_DEATH); } @@ -536,7 +538,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -605,7 +607,7 @@ class boss_high_nethermancer_zerevor : public CreatureScript public: boss_high_nethermancer_zerevor() : CreatureScript("boss_high_nethermancer_zerevor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_high_nethermancer_zerevorAI (creature); } @@ -621,7 +623,7 @@ public: uint32 Cooldown; uint32 ArcaneExplosionTimer; - void Reset() + void Reset() OVERRIDE { BlizzardTimer = urand(30, 91) * 1000; FlamestrikeTimer = urand(30, 91) * 1000; @@ -631,17 +633,17 @@ public: Cooldown = 0; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ZERE_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_ZERE_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -709,7 +711,7 @@ class boss_lady_malande : public CreatureScript public: boss_lady_malande() : CreatureScript("boss_lady_malande") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lady_malandeAI (creature); } @@ -723,7 +725,7 @@ public: uint32 DivineWrathTimer; uint32 ReflectiveShieldTimer; - void Reset() + void Reset() OVERRIDE { EmpoweredSmiteTimer = 38000; CircleOfHealingTimer = 20000; @@ -731,17 +733,17 @@ public: ReflectiveShieldTimer = 0; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_MALA_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_MALA_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -787,7 +789,7 @@ class boss_veras_darkshadow : public CreatureScript public: boss_veras_darkshadow() : CreatureScript("boss_veras_darkshadow") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_veras_darkshadowAI (creature); } @@ -804,7 +806,7 @@ public: bool HasVanished; - void Reset() + void Reset() OVERRIDE { EnvenomTargetGUID = 0; @@ -817,17 +819,17 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_VERA_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_VERA_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -901,7 +903,7 @@ public: { PrepareAuraScript(spell_boss_lady_malande_shield_AuraScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { return sSpellMgr->GetSpellInfo(SPELL_REFLECTIVE_SHIELD_T); } @@ -915,13 +917,13 @@ public: target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_REFLECTIVE_SHIELD_T, &bp, NULL, NULL, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { AfterEffectAbsorb += AuraEffectAbsorbFn(spell_boss_lady_malande_shield_AuraScript::Trigger, EFFECT_0); } }; - AuraScript* GetAuraScript() const + 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 97247f1b7a6..60092689cc0 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -47,7 +47,7 @@ class instance_black_temple : public InstanceMapScript public: instance_black_temple() : InstanceMapScript("instance_black_temple", 564) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_black_temple_InstanceMapScript(map); } @@ -238,7 +238,7 @@ public: } } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -264,7 +264,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -348,7 +348,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { 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 d25b9a25a85..545dbed7975 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fathomlord_karathressAI (creature); } @@ -127,7 +127,7 @@ public: uint64 Advisors[MAX_ADVISORS]; - void Reset() + void Reset() OVERRIDE { CataclysmicBolt_Timer = 10000; Enrage_Timer = 600000; //10 minutes @@ -201,12 +201,12 @@ public: instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -217,12 +217,12 @@ public: me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { StartEvent(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) @@ -310,7 +310,7 @@ class boss_fathomguard_sharkkis : public CreatureScript public: boss_fathomguard_sharkkis() : CreatureScript("boss_fathomguard_sharkkis") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fathomguard_sharkkisAI (creature); } @@ -333,7 +333,7 @@ public: uint64 SummonedPet; - void Reset() + void Reset() OVERRIDE { LeechingThrow_Timer = 20000; TheBeastWithin_Timer = 30000; @@ -354,7 +354,7 @@ public: instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -363,7 +363,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -372,7 +372,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) @@ -457,7 +457,7 @@ class boss_fathomguard_tidalvess : public CreatureScript public: boss_fathomguard_tidalvess() : CreatureScript("boss_fathomguard_tidalvess") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fathomguard_tidalvessAI (creature); } @@ -476,7 +476,7 @@ public: uint32 PoisonCleansing_Timer; uint32 Earthbind_Timer; - void Reset() + void Reset() OVERRIDE { FrostShock_Timer = 25000; Spitfire_Timer = 60000; @@ -487,7 +487,7 @@ public: instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -496,7 +496,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -506,7 +506,7 @@ public: DoCast(me, SPELL_WINDFURY_WEAPON); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) @@ -580,7 +580,7 @@ class boss_fathomguard_caribdis : public CreatureScript public: boss_fathomguard_caribdis() : CreatureScript("boss_fathomguard_caribdis") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fathomguard_caribdisAI (creature); } @@ -599,7 +599,7 @@ public: uint32 Heal_Timer; uint32 Cyclone_Timer; - void Reset() + void Reset() OVERRIDE { WaterBoltVolley_Timer = 35000; TidalSurge_Timer = 15000+rand()%5000; @@ -610,7 +610,7 @@ public: instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -619,7 +619,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -628,7 +628,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && 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 3b19393fa44..c96c0e0f269 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_hydross_the_unstableAI (creature); } @@ -111,7 +111,7 @@ public: bool beam; SummonList Summons; - void Reset() + void Reset() OVERRIDE { DeSummonBeams(); beams[0] = 0; @@ -169,7 +169,7 @@ public: } } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -177,12 +177,12 @@ public: instance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(CorruptedForm ? SAY_CORRUPT_SLAY : SAY_CLEAN_SLAY); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == ENTRY_PURE_SPAWN) { @@ -198,12 +198,12 @@ public: } } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { Summons.Despawn(summon); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(CorruptedForm ? SAY_CORRUPT_DEATH : SAY_CLEAN_DEATH); @@ -212,7 +212,7 @@ public: Summons.DespawnAll(); } - void UpdateAI(uint32 diff) + 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 7e168f8bf90..978a8fe6356 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lady_vashjAI (creature); } @@ -177,7 +177,7 @@ public: bool CanAttack; bool JustCreated; - void Reset() + void Reset() OVERRIDE { AggroTimer = 19000; ShockBlastTimer = 1+rand()%60000; @@ -223,12 +223,12 @@ public: if (TaintedElementalTimer > 50000) TaintedElementalTimer = 50000; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -246,7 +246,7 @@ public: instance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -263,7 +263,8 @@ public: AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!Intro) { @@ -310,7 +311,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!CanAttack && Intro) { @@ -548,7 +549,7 @@ class npc_enchanted_elemental : public CreatureScript public: npc_enchanted_elemental() : CreatureScript("npc_enchanted_elemental") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_enchanted_elementalAI (creature); } @@ -567,7 +568,7 @@ public: uint64 VashjGUID; - void Reset() + void Reset() OVERRIDE { me->SetSpeed(MOVE_WALK, 0.6f); // walk me->SetSpeed(MOVE_RUN, 0.6f); // run @@ -595,11 +596,12 @@ public: VashjGUID = instance->GetData64(DATA_LADYVASHJ); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; @@ -642,7 +644,7 @@ class npc_tainted_elemental : public CreatureScript public: npc_tainted_elemental() : CreatureScript("npc_tainted_elemental") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tainted_elementalAI (creature); } @@ -659,25 +661,25 @@ public: uint32 PoisonBoltTimer; uint32 DespawnTimer; - void Reset() + void Reset() OVERRIDE { PoisonBoltTimer = 5000+rand()%5000; DespawnTimer = 30000; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) 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) + void EnterCombat(Unit* who) OVERRIDE { me->AddThreat(who, 0.1f); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // PoisonBoltTimer if (PoisonBoltTimer <= diff) @@ -711,7 +713,7 @@ class npc_toxic_sporebat : public CreatureScript public: npc_toxic_sporebat() : CreatureScript("npc_toxic_sporebat") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_toxic_sporebatAI (creature); } @@ -731,7 +733,7 @@ public: uint32 BoltTimer; uint32 CheckTimer; - void Reset() + void Reset() OVERRIDE { me->SetDisableGravity(true); me->setFaction(14); @@ -741,11 +743,12 @@ public: CheckTimer = 1000; } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -754,7 +757,7 @@ public: MovementTimer = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // Random movement if (MovementTimer <= diff) @@ -809,7 +812,7 @@ class npc_shield_generator_channel : public CreatureScript public: npc_shield_generator_channel() : CreatureScript("npc_shield_generator_channel") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shield_generator_channelAI (creature); } @@ -825,7 +828,7 @@ public: uint32 CheckTimer; bool Casted; - void Reset() + void Reset() OVERRIDE { CheckTimer = 0; Casted = false; @@ -834,9 +837,10 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; @@ -866,7 +870,7 @@ class item_tainted_core : public ItemScript public: item_tainted_core() : ItemScript("item_tainted_core") { } - bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& targets) + 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 733ccf64101..b477d020d6a 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_inner_demonAI (creature); } @@ -91,33 +91,33 @@ public: uint32 Link_Timer; uint64 victimGUID; - void Reset() + void Reset() OVERRIDE { ShadowBolt_Timer = 10000; Link_Timer = 1000; } - void SetGUID(uint64 guid, int32 id/* = 0 */) + void SetGUID(uint64 guid, int32 id/* = 0 */) OVERRIDE { if (id == INNER_DEMON_VICTIM) victimGUID = guid; } - uint64 GetGUID(int32 id/* = 0 */) const + uint64 GetGUID(int32 id/* = 0 */) const OVERRIDE { if (id == INNER_DEMON_VICTIM) return victimGUID; return 0; } - void JustDied(Unit* /*killer*/) + 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) + 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*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (!victimGUID) return; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_leotheras_the_blindAI (creature); } @@ -218,7 +218,7 @@ public: uint64 Demon; uint64 SpellBinderGUID[3]; - void Reset() + void Reset() OVERRIDE { CheckChannelers(); BanishTimer = 1000; @@ -264,7 +264,8 @@ public: SpellBinderGUID[i] = binder->GetGUID(); } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->HasAura(AURA_BANISH)) return; @@ -383,7 +384,7 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -391,7 +392,7 @@ public: Talk(DemonForm ? SAY_DEMON_SLAY : SAY_NIGHTELF_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -405,7 +406,7 @@ public: instance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (me->HasAura(AURA_BANISH)) return; @@ -413,7 +414,7 @@ public: me->LoadEquipment(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (me->HasAura(AURA_BANISH) || !UpdateVictim()) @@ -601,7 +602,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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_leotheras_the_blind_demonformAI (creature); } @@ -613,7 +614,7 @@ public: uint32 ChaosBlast_Timer; bool DealDamage; - void Reset() + void Reset() OVERRIDE { ChaosBlast_Timer = 1000; DealDamage = true; @@ -624,7 +625,7 @@ public: Talk(SAY_FREE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -632,18 +633,18 @@ public: Talk(SAY_DEMON_SLAY); } - void JustDied(Unit* /*killer*/) + 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*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { StartEvent(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -674,7 +675,7 @@ class npc_greyheart_spellbinder : public CreatureScript public: npc_greyheart_spellbinder() : CreatureScript("npc_greyheart_spellbinder") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_greyheart_spellbinderAI (creature); } @@ -697,7 +698,7 @@ public: bool AddedBanish; - void Reset() + void Reset() OVERRIDE { Mindblast_Timer = urand(3000, 8000); Earthshock_Timer = urand(5000, 10000); @@ -711,14 +712,14 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { me->InterruptNonMeleeSpells(false); if (instance) instance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, who->GetGUID()); } - void JustRespawned() + void JustRespawned() OVERRIDE { AddedBanish = false; Reset(); @@ -737,7 +738,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (instance) { @@ -800,7 +801,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) {} + 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 2cc306c5df1..e3a7c379414 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_the_lurker_belowAI (creature); } @@ -116,7 +116,7 @@ public: return false; return true; } - void Reset() + void Reset() OVERRIDE { me->SetSwim(true); me->SetDisableGravity(true); @@ -149,7 +149,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -160,13 +160,14 @@ public: Summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!CanStartEvent) // boss is invisible, don't attack return; @@ -178,13 +179,13 @@ public: } } - void MovementInform(uint32 type, uint32 /*id*/) + void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE { if (type == ROTATE_MOTION_TYPE) me->SetReactState(REACT_AGGRESSIVE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!CanStartEvent) // boss is invisible, don't attack { @@ -370,7 +371,7 @@ class npc_coilfang_ambusher : public CreatureScript public: npc_coilfang_ambusher() : CreatureScript("npc_coilfang_ambusher") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_coilfang_ambusherAI (creature); } @@ -385,13 +386,14 @@ public: uint32 MultiShotTimer; uint32 ShootBowTimer; - void Reset() + void Reset() OVERRIDE { MultiShotTimer = 10000; ShootBowTimer = 4000; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || me->GetVictim()) return; @@ -400,7 +402,7 @@ public: AttackStart(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (MultiShotTimer <= diff) { @@ -429,7 +431,7 @@ class go_strange_pool : public GameObjectScript public: go_strange_pool() : GameObjectScript("go_strange_pool") {} - bool OnGossipHello(Player* player, GameObject* go) + 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 448492dd134..b0c6305abf1 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_morogrim_tidewalkerAI (creature); } @@ -116,7 +116,7 @@ public: bool Earthquake; bool Phase2; - void Reset() + void Reset() OVERRIDE { TidalWave_Timer = 10000; WateryGrave_Timer = 30000; @@ -142,12 +142,12 @@ public: instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -155,7 +155,7 @@ public: instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { PlayerList = &me->GetMap()->GetPlayers(); Playercount = PlayerList->getSize(); @@ -173,7 +173,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -292,7 +292,7 @@ class npc_water_globule : public CreatureScript public: npc_water_globule() : CreatureScript("npc_water_globule") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_water_globuleAI (creature); } @@ -303,7 +303,7 @@ public: uint32 Check_Timer; - void Reset() + void Reset() OVERRIDE { Check_Timer = 1000; @@ -312,9 +312,10 @@ public: me->setFaction(14); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!who || me->GetVictim()) return; @@ -327,7 +328,7 @@ public: } } - void UpdateAI(uint32 diff) + 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 b45029eb2bd..79e89740b2d 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) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); @@ -246,7 +246,7 @@ class instance_serpent_shrine : public InstanceMapScript } } - void SetData64(uint32 type, uint64 data) + 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 + 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) + 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 + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -447,7 +447,7 @@ class instance_serpent_shrine : public InstanceMapScript bool DoSpawnFrenzy; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + 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 9a7ca994291..ce28180bb78 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -52,7 +52,7 @@ class boss_hydromancer_thespia : public CreatureScript public: boss_hydromancer_thespia() : CreatureScript("boss_hydromancer_thespia") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_thespiaAI (creature); } @@ -70,7 +70,7 @@ public: uint32 LungBurst_Timer; uint32 EnvelopingWinds_Timer; - void Reset() + void Reset() OVERRIDE { LightningCloud_Timer = 15000; LungBurst_Timer = 7000; @@ -80,7 +80,7 @@ public: instance->SetData(TYPE_HYDROMANCER_THESPIA, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEAD); @@ -88,12 +88,12 @@ public: instance->SetData(TYPE_HYDROMANCER_THESPIA, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -101,7 +101,7 @@ public: instance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -152,7 +152,7 @@ class npc_coilfang_waterelemental : public CreatureScript public: npc_coilfang_waterelemental() : CreatureScript("npc_coilfang_waterelemental") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_coilfang_waterelementalAI (creature); } @@ -163,14 +163,14 @@ public: uint32 WaterBoltVolley_Timer; - void Reset() + void Reset() OVERRIDE { WaterBoltVolley_Timer = 3000+rand()%3000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + 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 feeac7d4a54..8662b2c93ec 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -61,7 +61,7 @@ class boss_mekgineer_steamrigger : public CreatureScript public: boss_mekgineer_steamrigger() : CreatureScript("boss_mekgineer_steamrigger") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_mekgineer_steamriggerAI (creature); } @@ -82,7 +82,7 @@ public: bool Summon50; bool Summon25; - void Reset() + void Reset() OVERRIDE { Shrink_Timer = 20000; Saw_Blade_Timer = 15000; @@ -96,7 +96,7 @@ public: instance->SetData(TYPE_MEKGINEER_STEAMRIGGER, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -104,12 +104,12 @@ public: instance->SetData(TYPE_MEKGINEER_STEAMRIGGER, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -132,7 +132,7 @@ public: DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -201,7 +201,7 @@ class npc_steamrigger_mechanic : public CreatureScript public: npc_steamrigger_mechanic() : CreatureScript("npc_steamrigger_mechanic") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_steamrigger_mechanicAI (creature); } @@ -217,19 +217,20 @@ public: uint32 Repair_Timer; - void Reset() + void Reset() OVERRIDE { Repair_Timer = 2000; } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { //react only if attacked } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + 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 d8cbcc8b49d..ee3e9a69c65 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -49,7 +49,7 @@ class npc_naga_distiller : public CreatureScript public: npc_naga_distiller() : CreatureScript("npc_naga_distiller") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_naga_distillerAI (creature); } @@ -63,7 +63,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -79,7 +79,7 @@ public: } } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} void StartRageGen(Unit* /*caster*/) { @@ -92,7 +92,7 @@ public: instance->SetData(TYPE_DISTILLER, IN_PROGRESS); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (me->GetHealth() <= damage) if (instance) @@ -107,7 +107,7 @@ class boss_warlord_kalithresh : public CreatureScript public: boss_warlord_kalithresh() : CreatureScript("boss_warlord_kalithresh") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_warlord_kalithreshAI (creature); } @@ -126,7 +126,7 @@ public: uint32 Rage_Timer; bool CanRage; - void Reset() + void Reset() OVERRIDE { Reflection_Timer = 10000; Impale_Timer = 7000+rand()%7000; @@ -137,7 +137,7 @@ public: instance->SetData(TYPE_WARLORD_KALITHRESH, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -145,12 +145,12 @@ public: instance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { //hack :( if (spell->Id == SPELL_WARLORDS_RAGE_PROC) @@ -159,7 +159,7 @@ public: me->RemoveAurasDueToSpell(SPELL_WARLORDS_RAGE_PROC); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -167,7 +167,7 @@ public: instance->SetData(TYPE_WARLORD_KALITHRESH, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index 1beffd1d45d..9377ea9197f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -41,7 +41,7 @@ class boss_hungarfen : public CreatureScript public: boss_hungarfen() : CreatureScript("boss_hungarfen") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_hungarfenAI (creature); } @@ -56,18 +56,18 @@ public: uint32 Mushroom_Timer; uint32 AcidGeyser_Timer; - void Reset() + 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*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + 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 + 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() + void Reset() OVERRIDE { Stop = false; Grow_Timer = 0; @@ -132,13 +132,14 @@ public: DoCast(me, SPELL_SPORE_CLOUD, true); } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) {} - void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 diff) OVERRIDE { if (Stop) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index e5d0726dca4..c76e677d206 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/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 + 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() + void Reset() OVERRIDE { Levitate_Timer = 12000; ChainLightning_Timer = 6000; @@ -80,9 +80,9 @@ public: Striders.clear(); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER) { @@ -95,14 +95,14 @@ public: } } - void JustDied(Unit* /*killer*/) + 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) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 22ddd76e9e8..9144411fcc6 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -60,7 +60,7 @@ class boss_gruul : public CreatureScript public: boss_gruul() : CreatureScript("boss_gruul") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gruulAI (creature); } @@ -83,7 +83,7 @@ public: bool m_bPerformingGroundSlam; - void Reset() + void Reset() OVERRIDE { m_uiGrowth_Timer= 30000; m_uiCaveIn_Timer= 27000; @@ -97,7 +97,7 @@ public: instance->SetData(DATA_GRUULEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -105,12 +105,12 @@ public: instance->SetData(DATA_GRUULEVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -121,7 +121,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* pSpell) + 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. @@ -161,7 +161,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -263,7 +263,7 @@ class spell_gruul_shatter : public SpellScriptLoader { PrepareSpellScript(spell_gruul_shatter_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_STONED)) return false; @@ -281,13 +281,13 @@ class spell_gruul_shatter : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gruul_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gruul_shatter_SpellScript(); } @@ -316,13 +316,13 @@ class spell_gruul_shatter_effect : public SpellScriptLoader SetHitDamage(int32(GetHitDamage() * ((radius - distance) / radius))); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_gruul_shatter_effect_SpellScript::CalculateDamage); } }; - SpellScript* GetSpellScript() const + 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 f927f606bda..6fa6b9b2e20 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -110,7 +110,7 @@ class boss_high_king_maulgar : public CreatureScript public: boss_high_king_maulgar() : CreatureScript("boss_high_king_maulgar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_high_king_maulgarAI (creature); } @@ -136,7 +136,7 @@ public: uint64 Council[4]; - void Reset() + void Reset() OVERRIDE { ArcingSmash_Timer = 10000; MightyBlow_Timer = 40000; @@ -167,12 +167,12 @@ public: instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -185,7 +185,7 @@ public: Talk(SAY_OGRE_DEATH); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { StartEvent(who); } @@ -217,7 +217,7 @@ public: DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) @@ -309,7 +309,7 @@ class boss_olm_the_summoner : public CreatureScript public: boss_olm_the_summoner() : CreatureScript("boss_olm_the_summoner") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_olm_the_summonerAI (creature); } @@ -327,7 +327,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { DarkDecay_Timer = 10000; Summon_Timer = 15000; @@ -338,7 +338,7 @@ public: instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -353,7 +353,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -362,7 +362,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -377,7 +377,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) @@ -437,7 +437,7 @@ class boss_kiggler_the_crazed : public CreatureScript public: boss_kiggler_the_crazed() : CreatureScript("boss_kiggler_the_crazed") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kiggler_the_crazedAI (creature); } @@ -456,7 +456,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { GreaterPolymorph_Timer = 5000; LightningBolt_Timer = 10000; @@ -468,7 +468,7 @@ public: instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -477,7 +477,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -492,7 +492,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) @@ -558,7 +558,7 @@ class boss_blindeye_the_seer : public CreatureScript public: boss_blindeye_the_seer() : CreatureScript("boss_blindeye_the_seer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_blindeye_the_seerAI (creature); } @@ -576,7 +576,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { GreaterPowerWordShield_Timer = 5000; Heal_Timer = urand(25000, 40000); @@ -587,7 +587,7 @@ public: instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -596,7 +596,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -611,7 +611,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) @@ -668,7 +668,7 @@ class boss_krosh_firehand : public CreatureScript public: boss_krosh_firehand() : CreatureScript("boss_krosh_firehand") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_krosh_firehandAI (creature); } @@ -686,7 +686,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { GreaterFireball_Timer = 1000; SpellShield_Timer = 5000; @@ -697,7 +697,7 @@ public: instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -706,7 +706,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -721,7 +721,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index e8aa6838d09..3fbdfe94c05 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -39,7 +39,7 @@ class instance_gruuls_lair : public InstanceMapScript public: instance_gruuls_lair() : InstanceMapScript("instance_gruuls_lair", 565) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_gruuls_lair_InstanceMapScript(map); } @@ -111,13 +111,13 @@ public: } } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 type, uint64 data) OVERRIDE { if (type == DATA_MAULGAREVENT_TANK) MaulgarEvent_Tank = data; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -133,7 +133,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -156,7 +156,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 39da979dd68..2f5e160b335 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -64,7 +64,7 @@ class boss_broggok : public CreatureScript uint32 PoisonBolt_Timer; bool canAttack; - void Reset() + void Reset() OVERRIDE { _Reset(); AcidSpray_Timer = 10000; @@ -74,12 +74,12 @@ class boss_broggok : public CreatureScript instance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -87,7 +87,7 @@ class boss_broggok : public CreatureScript summoned->CastSpell(summoned, SPELL_POISON, false, 0, 0, me->GetGUID()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -120,7 +120,7 @@ class boss_broggok : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -130,7 +130,7 @@ class boss_broggok : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -152,7 +152,7 @@ class boss_broggok : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_broggokAI(creature); } @@ -163,7 +163,7 @@ class go_broggok_lever : public GameObjectScript public: go_broggok_lever() : GameObjectScript("go_broggok_lever") {} - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (InstanceScript* instance = go->GetInstanceScript()) if (instance->GetData(TYPE_BROGGOK_EVENT) != DONE && instance->GetData(TYPE_BROGGOK_EVENT) != IN_PROGRESS) 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 931f83bf884..fedf56eb929 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 @@ -97,7 +97,7 @@ class boss_kelidan_the_breaker : public CreatureScript bool addYell; uint64 Channelers[5]; - void Reset() + void Reset() OVERRIDE { ShadowVolley_Timer = 1000; BurningNova_Timer = 15000; @@ -112,7 +112,7 @@ class boss_kelidan_the_breaker : public CreatureScript instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_WAKE); if (me->IsNonMeleeSpellCasted(false)) @@ -122,7 +122,7 @@ class boss_kelidan_the_breaker : public CreatureScript instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (rand()%2) return; @@ -189,7 +189,7 @@ class boss_kelidan_the_breaker : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DIE); @@ -201,7 +201,7 @@ class boss_kelidan_the_breaker : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_DOOR6), true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -273,7 +273,7 @@ class boss_kelidan_the_breaker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kelidan_the_breakerAI(creature); } @@ -306,7 +306,7 @@ class npc_shadowmoon_channeler : public CreatureScript uint32 MarkOfShadow_Timer; uint32 check_Timer; - void Reset() + void Reset() OVERRIDE { ShadowBolt_Timer = 1000+rand()%1000; MarkOfShadow_Timer = 5000+rand()%2000; @@ -315,7 +315,7 @@ class npc_shadowmoon_channeler : public CreatureScript me->InterruptNonMeleeSpells(true); } - void EnterCombat(Unit* who) + 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); @@ -324,13 +324,13 @@ class npc_shadowmoon_channeler : public CreatureScript DoStartMovement(who); } - void JustDied(Unit* killer) + 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) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -371,7 +371,7 @@ class npc_shadowmoon_channeler : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new 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 f200d533ceb..33e23c12d14 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -65,7 +65,7 @@ class boss_the_maker : public CreatureScript uint32 Domination_Timer; uint32 Knockdown_Timer; - void Reset() + void Reset() OVERRIDE { AcidSpray_Timer = 15000; ExplodingBreaker_Timer = 6000; @@ -79,7 +79,7 @@ class boss_the_maker : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_DOOR2), true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -90,12 +90,12 @@ class boss_the_maker : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_DOOR2), false); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DIE); @@ -108,7 +108,7 @@ class boss_the_maker : public CreatureScript } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -154,7 +154,7 @@ class boss_the_maker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new 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 65ae859b5ae..22b1b776e40 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -175,7 +175,7 @@ class instance_blood_furnace : public InstanceMapScript BroggokLeverGUID = go->GetGUID(); //Broggok lever } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -201,7 +201,7 @@ class instance_blood_furnace : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -231,7 +231,7 @@ class instance_blood_furnace : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -409,7 +409,7 @@ class instance_blood_furnace : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + 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 50b74cbc0c1..5edf604a108 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 @@ -75,7 +75,7 @@ class boss_omor_the_unscarred : public CreatureScript uint64 PlayerGUID; bool CanPullBack; - void Reset() + void Reset() OVERRIDE { Talk(SAY_WIPE); @@ -90,12 +90,12 @@ class boss_omor_the_unscarred : public CreatureScript CanPullBack = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (rand()%2) return; @@ -103,7 +103,7 @@ class boss_omor_the_unscarred : public CreatureScript Talk(SAY_KILL_1); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { Talk(SAY_SUMMON); @@ -113,12 +113,12 @@ class boss_omor_the_unscarred : public CreatureScript ++SummonedCount; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DIE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -219,7 +219,7 @@ class boss_omor_the_unscarred : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new 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 b3d89d0cf03..65e389f9eea 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 @@ -98,16 +98,16 @@ class boss_nazan : public CreatureScript uint64 VazrudenGUID; SpellInfo* liquid_fire; - void Reset() + void Reset() OVERRIDE { Fireball_Timer = 4000; Fly_Timer = 45000; Turn_Timer = 0; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned && summoned->GetEntry() == ENTRY_LIQUID_FIRE) { @@ -118,13 +118,13 @@ class boss_nazan : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* entry) + void SpellHitTarget(Unit* target, const SpellInfo* entry) OVERRIDE { if (target && entry->Id == uint32(SPELL_FIREBALL)) me->SummonCreature(ENTRY_LIQUID_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -195,7 +195,7 @@ class boss_nazan : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_nazanAI(creature); } @@ -219,31 +219,31 @@ class boss_vazruden : public CreatureScript bool WipeSaid; uint32 UnsummonCheck; - void Reset() + void Reset() OVERRIDE { Revenge_Timer = 4000; UnsummonCheck = 2000; WipeSaid = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who && who->GetEntry() != ENTRY_VAZRUDEN) Talk(SAY_KILL); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (killer && killer != me) Talk(SAY_DIE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -273,7 +273,7 @@ class boss_vazruden : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_vazrudenAI(creature); } @@ -308,7 +308,7 @@ class boss_vazruden_the_herald : public CreatureScript bool summoned; bool lootSpawned; - void Reset() + void Reset() OVERRIDE { phase = 0; waypoint = 0; @@ -357,7 +357,7 @@ class boss_vazruden_the_herald : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (phase == 0) { @@ -367,7 +367,7 @@ class boss_vazruden_the_herald : public CreatureScript } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (!summoned) return; @@ -396,7 +396,7 @@ class boss_vazruden_the_herald : public CreatureScript sentryDown = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { switch (phase) { @@ -454,7 +454,7 @@ class boss_vazruden_the_herald : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_vazruden_the_heraldAI(creature); } @@ -474,20 +474,20 @@ class npc_hellfire_sentry : public CreatureScript uint32 KidneyShot_Timer; - void Reset() + void Reset() OVERRIDE { KidneyShot_Timer = urand(3000, 7000); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (Creature* herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD, 150)) CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(killer); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -504,7 +504,7 @@ class npc_hellfire_sentry : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const + 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 044c22f7ac0..837384dda2d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -66,7 +66,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript bool HasTaunted; bool YelledForHeal; - void Reset() + void Reset() OVERRIDE { Surge_Timer = 5000; MortalWound_Timer = 4000; @@ -76,12 +76,13 @@ class boss_watchkeeper_gargolmar : public CreatureScript YelledForHeal = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!me->GetVictim() && me->CanCreatureAttack(who)) { @@ -102,17 +103,17 @@ class boss_watchkeeper_gargolmar : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DIE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -161,7 +162,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_watchkeeper_gargolmarAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index d6d346e6603..f99bb4ade85 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() + void Reset() OVERRIDE { FireBlast_Timer = 6000; } - void SpellHit(Unit*, const SpellInfo* spell) + void SpellHit(Unit*, const SpellInfo* spell) OVERRIDE { if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET) { @@ -136,22 +136,23 @@ class npc_abyssal : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!trigger) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!trigger) ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (trigger) { @@ -187,7 +188,7 @@ class npc_abyssal : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_abyssalAI(creature); } @@ -226,7 +227,7 @@ class boss_magtheridon : public CreatureScript bool Phase3; bool NeedCheckCube; - void Reset() + void Reset() OVERRIDE { Berserk_Timer = 1320000; Quake_Timer = 40000; @@ -246,7 +247,7 @@ class boss_magtheridon : public CreatureScript DoCast(me, SPELL_SHADOW_CAGE_C, true); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) { @@ -306,12 +307,12 @@ class boss_magtheridon : public CreatureScript NeedCheckCube = false; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_PLAYER_KILLED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_MAGTHERIDON_EVENT, DONE); @@ -319,15 +320,16 @@ class boss_magtheridon : public CreatureScript Talk(SAY_DEATH); } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!me->HasUnitState(UNIT_STATE_STUNNED)) ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS); @@ -339,7 +341,7 @@ class boss_magtheridon : public CreatureScript Talk(SAY_FREED); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) { @@ -453,7 +455,7 @@ class boss_magtheridon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_magtheridonAI(creature); } @@ -484,7 +486,7 @@ class npc_hellfire_channeler : public CreatureScript uint32 Check_Timer; - void Reset() + void Reset() OVERRIDE { ShadowBoltVolley_Timer = urand(8000, 10000); DarkMending_Timer = 10000; @@ -494,7 +496,7 @@ class npc_hellfire_channeler : public CreatureScript Check_Timer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS); @@ -503,7 +505,7 @@ class npc_hellfire_channeler : public CreatureScript DoZoneInCombat(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) instance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED); @@ -511,24 +513,24 @@ class npc_hellfire_channeler : public CreatureScript DoCast(me, SPELL_SHADOW_GRASP_C, false); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summon->AI()->AttackStart(me->GetVictim()); } - void DamageTaken(Unit*, uint32 &damage) + void DamageTaken(Unit*, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth()) DoCast(me, SPELL_SOUL_TRANSFER, true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_CHANNELER_EVENT, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -572,7 +574,7 @@ class npc_hellfire_channeler : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_hellfire_channelerAI(creature); } @@ -586,7 +588,7 @@ public: { } - bool OnGossipHello(Player* player, GameObject* go) + 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 75030ebc381..efca48505a8 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -123,7 +123,7 @@ class instance_magtheridons_lair : public InstanceMapScript } } - uint64 GetData64(uint32 type) const + 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) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -211,7 +211,7 @@ class instance_magtheridons_lair : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_MAGTHERIDON_EVENT) return m_auiEncounter[0]; @@ -254,7 +254,7 @@ class instance_magtheridons_lair : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + 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 44632b36647..3381524f17e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -89,7 +89,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript uint32 ShadowFissure_Timer; uint32 Cleave_Timer; - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -146,7 +146,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (IsIntroEvent || !IsMainEvent) return; @@ -160,7 +160,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!IntroOnce && me->IsWithinDistInMap(who, 50.0f)) { @@ -181,12 +182,12 @@ class boss_grand_warlock_nethekurse : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -197,12 +198,12 @@ class boss_grand_warlock_nethekurse : public CreatureScript summoned->CastSpell(summoned, SPELL_CONSUMPTION, false, 0, 0, me->GetGUID()); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DIE); @@ -213,7 +214,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_NETHEKURSE_DOOR), true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsIntroEvent) { @@ -279,7 +280,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_grand_warlock_nethekurseAI(creature); } @@ -304,17 +305,18 @@ class npc_fel_orc_convert : public CreatureScript InstanceScript* instance; uint32 Hemorrhage_Timer; - void Reset() + void Reset() OVERRIDE { me->SetNoCallAssistance(true); //we don't want any assistance (WE R HEROZ!) Hemorrhage_Timer = 3000; } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) { @@ -334,7 +336,7 @@ class npc_fel_orc_convert : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -346,7 +348,7 @@ class npc_fel_orc_convert : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -361,7 +363,7 @@ class npc_fel_orc_convert : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fel_orc_convertAI(creature); } @@ -381,13 +383,14 @@ class npc_lesser_shadow_fissure : public CreatureScript { npc_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } - void MoveInLineOfSight(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void EnterCombat(Unit* /*who*/) {} + void Reset() OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void AttackStart(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + 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 1caf30dd831..0387fca0e18 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -124,19 +124,19 @@ class npc_omrogg_heads : public CreatureScript bool DeathYell; uint32 Death_Timer; - void Reset() + void Reset() OVERRIDE { Death_Timer = 4000; DeathYell = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void DoDeathYell() { DeathYell = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!DeathYell) return; @@ -150,7 +150,7 @@ class npc_omrogg_heads : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_omrogg_headsAI(creature); } @@ -195,7 +195,7 @@ class boss_warbringer_omrogg : public CreatureScript uint32 ThunderClap_Timer; uint32 ResetThreat_Timer; - void Reset() + void Reset() OVERRIDE { if (Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID)) { @@ -244,7 +244,7 @@ class boss_warbringer_omrogg : public CreatureScript ThreatYell = true; } - void EnterCombat(Unit* /*who*/) + 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); @@ -263,7 +263,7 @@ class boss_warbringer_omrogg : public CreatureScript instance->SetData(TYPE_OMROGG, IN_PROGRESS); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_LEFT_HEAD) LeftHeadGUID = summoned->GetGUID(); @@ -276,7 +276,7 @@ class boss_warbringer_omrogg : public CreatureScript summoned->SetVisible(false); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Creature* pLeftHead = Creature::GetCreature(*me, LeftHeadGUID); Creature* pRightHead = Creature::GetCreature(*me, RightHeadGUID); @@ -302,7 +302,7 @@ class boss_warbringer_omrogg : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Creature* pLeftHead = Creature::GetCreature(*me, LeftHeadGUID); Creature* pRightHead = Creature::GetCreature(*me, RightHeadGUID); @@ -318,7 +318,7 @@ class boss_warbringer_omrogg : public CreatureScript instance->SetData(TYPE_OMROGG, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Delay_Timer <= diff) { @@ -421,7 +421,7 @@ class boss_warbringer_omrogg : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_warbringer_omroggAI (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 9e6eaf0b3d6..05f1bb7121c 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 @@ -88,7 +88,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript uint32 target_num; - void Reset() + void Reset() OVERRIDE { removeAdds(); @@ -106,12 +106,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript resetcheck_timer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { switch (summoned->GetEntry()) { @@ -127,7 +127,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) { @@ -135,13 +135,13 @@ class boss_warchief_kargath_bladefist : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); removeAdds(); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (InBlade) { @@ -194,7 +194,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) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -314,7 +314,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new 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 95579aba002..0f00d73a81d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -74,7 +74,7 @@ class instance_shattered_halls : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -87,7 +87,7 @@ class instance_shattered_halls : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -99,7 +99,7 @@ class instance_shattered_halls : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -112,7 +112,7 @@ class instance_shattered_halls : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_shattered_halls_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 556b02606f7..389634a50bf 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -110,7 +110,7 @@ class boss_alar : public CreatureScript int8 cur_wp; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_ALAREVENT, NOT_STARTED); @@ -137,7 +137,7 @@ class boss_alar : public CreatureScript me->setActive(false); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_ALAREVENT, IN_PROGRESS); @@ -147,22 +147,23 @@ class boss_alar : public CreatureScript me->setActive(true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_ALAREVENT, DONE); } - void JustSummoned(Creature* summon) + 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*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* who) + + void AttackStart(Unit* who) OVERRIDE { if (Phase1) AttackStartNoMove(who); @@ -170,7 +171,7 @@ class boss_alar : public CreatureScript ScriptedAI::AttackStart(who); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) + void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && Phase1) { @@ -192,7 +193,7 @@ class boss_alar : public CreatureScript } } - void SpellHit(Unit*, const SpellInfo* spell) + void SpellHit(Unit*, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_DIVE_BOMB_VISUAL) { @@ -202,7 +203,7 @@ class boss_alar : public CreatureScript } } - void MovementInform(uint32 type, uint32 /*id*/) + void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE { if (type == POINT_MOTION_TYPE) { @@ -212,7 +213,7 @@ class boss_alar : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) // sometimes IsInCombat but !incombat, faction bug? return; @@ -452,7 +453,7 @@ class boss_alar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_alarAI(creature); } @@ -479,20 +480,20 @@ class npc_ember_of_alar : public CreatureScript InstanceScript* instance; bool toDie; - void Reset() + void Reset() OVERRIDE { toDie = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { me->setDeathState(JUST_DIED); } - void DamageTaken(Unit* killer, uint32 &damage) + void DamageTaken(Unit* killer, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && killer != me && !toDie) { @@ -515,7 +516,7 @@ class npc_ember_of_alar : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -531,7 +532,7 @@ class npc_ember_of_alar : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ember_of_alarAI(creature); } @@ -549,14 +550,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() {} - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 /*diff*/) {} + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 /*diff*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + 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 18f72698beb..5a070017986 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() + void Reset() OVERRIDE { ArcaneMissiles_Timer = 2000; m_uiWrathOfTheAstromancer_Timer = 15000; @@ -158,12 +158,12 @@ class boss_high_astromancer_solarian : public CreatureScript Summons.DespawnAll(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->SetObjectScale(defaultsize); me->SetDisplayId(MODEL_HUMAN); @@ -172,7 +172,7 @@ class boss_high_astromancer_solarian : public CreatureScript instance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); DoZoneInCombat(); @@ -208,7 +208,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) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -417,7 +417,7 @@ class boss_high_astromancer_solarian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_high_astromancer_solarianAI (creature); } @@ -445,18 +445,18 @@ class npc_solarium_priest : public CreatureScript uint32 holysmiteTimer; uint32 aoesilenceTimer; - void Reset() + void Reset() OVERRIDE { healTimer = 9000; holysmiteTimer = 1; aoesilenceTimer = 15000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -504,7 +504,7 @@ class npc_solarium_priest : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_solarium_priestAI(creature); } @@ -519,7 +519,7 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader { PrepareAuraScript(spell_astromancer_wrath_of_the_astromancer_AuraScript); - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WRATH_OF_THE_ASTROMANCER_DOT)) return false; @@ -536,13 +536,13 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader target->CastSpell(target, GetSpellInfo()->Effects[EFFECT_1].CalcValue(), false); } - void Register() + 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 + 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 d0d580c824b..cf25efb17c6 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() + void Reset() OVERRIDE { if (m_bDoubled_Health) { @@ -187,7 +187,8 @@ struct advisorbase_ai : public ScriptedAI Kaelthas->AI()->EnterEvadeMode(); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -195,7 +196,7 @@ struct advisorbase_ai : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -216,7 +217,7 @@ struct advisorbase_ai : public ScriptedAI DelayRes_Timer = 2000; } - void DamageTaken(Unit* killer, uint32 &damage) + void DamageTaken(Unit* killer, uint32 &damage) OVERRIDE { if (damage < me->GetHealth()) return; @@ -252,7 +253,7 @@ struct advisorbase_ai : public ScriptedAI } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (DelayRes_Timer) { @@ -317,7 +318,7 @@ class boss_kaelthas : public CreatureScript uint64 m_auiAdvisorGuid[MAX_ADVISORS]; - void Reset() + void Reset() OVERRIDE { Fireball_Timer = 5000+rand()%10000; ArcaneDisruption_Timer = 45000; @@ -402,7 +403,8 @@ class boss_kaelthas : public CreatureScript } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!me->HasUnitState(UNIT_STATE_STUNNED) && me->CanCreatureAttack(who)) { @@ -429,18 +431,18 @@ class boss_kaelthas : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && !instance->GetData(DATA_KAELTHASEVENT) && !Phase) StartEvent(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { // if not phoenix, then it's one of the 7 weapons if (summoned->GetEntry() != NPC_PHOENIX) @@ -452,12 +454,12 @@ class boss_kaelthas : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { summons.Despawn(summon); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -476,7 +478,7 @@ class boss_kaelthas : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Phase 1 switch (Phase) @@ -1007,7 +1009,7 @@ class boss_kaelthas : public CreatureScript } } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kaelthasAI(creature); } @@ -1030,7 +1032,7 @@ class boss_thaladred_the_darkener : public CreatureScript uint32 Silence_Timer; uint32 PsychicBlow_Timer; - void Reset() + void Reset() OVERRIDE { Gaze_Timer = 100; Silence_Timer = 20000; @@ -1039,7 +1041,7 @@ class boss_thaladred_the_darkener : public CreatureScript advisorbase_ai::Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1051,13 +1053,13 @@ class boss_thaladred_the_darkener : public CreatureScript me->AddThreat(who, 5000000.0f); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_THALADRED_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { advisorbase_ai::UpdateAI(diff); @@ -1105,7 +1107,7 @@ class boss_thaladred_the_darkener : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_thaladred_the_darkenerAI(creature); } @@ -1126,13 +1128,13 @@ class boss_lord_sanguinar : public CreatureScript uint32 Fear_Timer; - void Reset() + void Reset() OVERRIDE { Fear_Timer = 20000; advisorbase_ai::Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1143,13 +1145,13 @@ class boss_lord_sanguinar : public CreatureScript Talk(SAY_SANGUINAR_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_SANGUINAR_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { advisorbase_ai::UpdateAI(diff); @@ -1173,7 +1175,7 @@ class boss_lord_sanguinar : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lord_sanguinarAI(creature); } @@ -1197,7 +1199,7 @@ class boss_grand_astromancer_capernian : public CreatureScript uint32 Yell_Timer; bool Yell; - void Reset() + void Reset() OVERRIDE { Fireball_Timer = 2000; Conflagration_Timer = 20000; @@ -1208,13 +1210,13 @@ class boss_grand_astromancer_capernian : public CreatureScript advisorbase_ai::Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_CAPERNIAN_DEATH); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1229,7 +1231,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1238,7 +1240,7 @@ class boss_grand_astromancer_capernian : public CreatureScript return; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { advisorbase_ai::UpdateAI(diff); @@ -1317,7 +1319,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_grand_astromancer_capernianAI(creature); } @@ -1339,7 +1341,7 @@ class boss_master_engineer_telonicus : public CreatureScript uint32 Bomb_Timer; uint32 RemoteToy_Timer; - void Reset() + void Reset() OVERRIDE { Bomb_Timer = 10000; RemoteToy_Timer = 5000; @@ -1347,13 +1349,13 @@ class boss_master_engineer_telonicus : public CreatureScript advisorbase_ai::Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_TELONICUS_DEATH); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1364,7 +1366,7 @@ class boss_master_engineer_telonicus : public CreatureScript Talk(SAY_TELONICUS_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { advisorbase_ai::UpdateAI(diff); @@ -1400,7 +1402,7 @@ class boss_master_engineer_telonicus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_master_engineer_telonicusAI(creature); } @@ -1426,7 +1428,7 @@ class npc_kael_flamestrike : public CreatureScript bool Casting; bool KillSelf; - void Reset() + void Reset() OVERRIDE { Timer = 5000; Casting = false; @@ -1436,11 +1438,12 @@ class npc_kael_flamestrike : public CreatureScript me->setFaction(14); } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} - void UpdateAI(uint32 diff) + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 diff) OVERRIDE { if (!Casting) { @@ -1467,7 +1470,7 @@ class npc_kael_flamestrike : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kael_flamestrikeAI(creature); } @@ -1488,20 +1491,20 @@ class npc_phoenix_tk : public CreatureScript uint32 Cycle_Timer; - void Reset() + void Reset() OVERRIDE { Cycle_Timer = 2000; DoCast(me, SPELL_BURN, true); } - void JustDied(Unit* /*killer*/) + 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) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1521,7 +1524,7 @@ class npc_phoenix_tk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_phoenix_tkAI(creature); } @@ -1542,15 +1545,16 @@ class npc_phoenix_egg_tk : public CreatureScript uint32 Rebirth_Timer; - void Reset() + void Reset() OVERRIDE { Rebirth_Timer = 15000; } //ignore any - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->Attack(who, false)) { @@ -1561,13 +1565,13 @@ class npc_phoenix_egg_tk : public CreatureScript } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AddThreat(me->GetVictim(), 0.0f); summoned->CastSpell(summoned, SPELL_REBIRTH, false); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Rebirth_Timer) return; @@ -1582,7 +1586,7 @@ class npc_phoenix_egg_tk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + 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 63e3d8b42ea..f842ed19f3c 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() + 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*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); DoZoneInCombat(); @@ -95,7 +95,7 @@ class boss_void_reaver : public CreatureScript instance->SetData(DATA_VOIDREAVEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -103,7 +103,7 @@ class boss_void_reaver : public CreatureScript instance->SetData(DATA_VOIDREAVEREVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -170,7 +170,7 @@ class boss_void_reaver : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new 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 e43d2f9b13a..e47995befff 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -113,7 +113,7 @@ class instance_the_eye : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) const + 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) + 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 + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -192,7 +192,7 @@ class instance_the_eye : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + 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 8ba7a4722bb..ab9b6ab3046 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() + void Reset() OVERRIDE { Countercharge_Timer = 9000; Knockaway_Timer = 25000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -100,7 +100,7 @@ class npc_crystalcore_devastator : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + 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 18ea83f7121..d4a38cc3566 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*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) + 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*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -115,7 +115,7 @@ class boss_gatewatcher_gyrokill : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + 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 5e29a8d0c31..7dc073d82d7 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*/) + 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*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (roll_chance_i(50)) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -122,7 +122,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + 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 728b3f715b2..06296ca3ae2 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*/) + 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*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(YELL_KILL); } - void JustDied(Unit* /*victim*/) + void JustDied(Unit* /*victim*/) OVERRIDE { _JustDied(); Talk(YELL_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -149,7 +149,7 @@ class boss_mechano_lord_capacitus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_mechano_lord_capacitusAI(creature); } @@ -164,7 +164,7 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader { PrepareSpellScript(spell_capacitus_polarity_charge_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_CHARGE)) return false; @@ -210,14 +210,14 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader SetHitDamage(0); } - void Register() + 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 + SpellScript* GetSpellScript() const OVERRIDE { return new spell_capacitus_polarity_charge_SpellScript(); } @@ -232,7 +232,7 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader { PrepareSpellScript(spell_capacitus_polarity_shift_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_POLARITY) || !sSpellMgr->GetSpellInfo(SPELL_NEGATIVE_POLARITY)) return false; @@ -247,13 +247,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() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + 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 f77c54c25e6..565aefbd6b9 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) + 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*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -136,7 +136,7 @@ class boss_nethermancer_sepethrea : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + 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() + 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*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check_Timer if (Check_Timer <= diff) @@ -221,7 +221,7 @@ class npc_ragin_flames : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new 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 adcfff10684..30194bb20d9 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*/) + 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*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + 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) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -158,7 +158,7 @@ class boss_pathaleon_the_calculator : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + 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() + 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*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -230,7 +230,7 @@ class npc_nether_wraith : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + 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 146569db284..64ebef52a87 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -135,7 +135,7 @@ class instance_mechanar : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + 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 96dc4d06588..f03cb033b0f 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -91,7 +91,7 @@ class npc_millhouse_manastorm : public CreatureScript uint32 Pyroblast_Timer; uint32 Fireball_Timer; - void Reset() + void Reset() OVERRIDE { EventProgress_Timer = 2000; LowHp = false; @@ -111,7 +111,7 @@ class npc_millhouse_manastorm : public CreatureScript } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->Attack(who, true)) { @@ -122,14 +122,14 @@ class npc_millhouse_manastorm : public CreatureScript } } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -138,7 +138,7 @@ class npc_millhouse_manastorm : public CreatureScript ->FailQuest();*/ } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Init) { @@ -221,7 +221,7 @@ class npc_millhouse_manastorm : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_millhouse_manastormAI(creature); } @@ -293,7 +293,7 @@ class npc_warden_mellichar : public CreatureScript uint32 EventProgress_Timer; uint32 Phase; - void Reset() + void Reset() OVERRIDE { IsRunning = false; CanSpawn = false; @@ -308,9 +308,10 @@ class npc_warden_mellichar : public CreatureScript instance->SetData(TYPE_HARBINGERSKYRISS, NOT_STARTED); } - void AttackStart(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (IsRunning) return; @@ -328,7 +329,7 @@ class npc_warden_mellichar : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(YELL_INTRO1); DoCast(me, SPELL_BUBBLE_VISUAL); @@ -398,7 +399,7 @@ class npc_warden_mellichar : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!IsRunning) return; @@ -514,7 +515,7 @@ class npc_warden_mellichar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_warden_mellicharAI(creature); } @@ -540,7 +541,7 @@ class npc_zerekethvoidzone : public CreatureScript { npc_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->SetUInt32Value(UNIT_NPC_FLAGS, 0); me->setFaction(16); @@ -549,10 +550,10 @@ class npc_zerekethvoidzone : public CreatureScript DoCast(me, SPELL_VOID_ZONE_DAMAGE); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_zerekethvoidzoneAI(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 c5261b48b78..ea20626281c 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -87,7 +87,7 @@ class boss_harbinger_skyriss : public CreatureScript uint32 Domination_Timer; uint32 ManaBurn_Timer; - void Reset() + void Reset() OVERRIDE { if (!Intro) me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); @@ -103,7 +103,8 @@ class boss_harbinger_skyriss : public CreatureScript ManaBurn_Timer = 25000; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!Intro) return; @@ -111,16 +112,16 @@ class boss_harbinger_skyriss : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_HARBINGERSKYRISS, DONE); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (!summon) return; @@ -133,7 +134,7 @@ class boss_harbinger_skyriss : public CreatureScript summon->AI()->AttackStart(target); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { //won't yell killing pet/other unit if (victim->GetEntry() == 21436) @@ -155,7 +156,7 @@ class boss_harbinger_skyriss : public CreatureScript DoCast(me, SPELL_33_ILLUSION); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Intro) { @@ -272,7 +273,7 @@ class boss_harbinger_skyriss : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_harbinger_skyrissAI (creature); } @@ -290,12 +291,12 @@ class boss_harbinger_skyriss_illusion : public CreatureScript { boss_harbinger_skyriss_illusionAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_harbinger_skyriss_illusionAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index c6fdda02d71..725c5c5aa17 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -148,7 +148,7 @@ class instance_arcatraz : public InstanceMapScript MellicharGUID = creature->GetGUID(); } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -230,7 +230,7 @@ class instance_arcatraz : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -244,7 +244,7 @@ class instance_arcatraz : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -255,7 +255,7 @@ class instance_arcatraz : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + 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 6775fb95824..bd67f4be8b7 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() + void Reset() OVERRIDE { _Reset(); _phase = true; } - void EnterCombat(Unit* /*who*/) + 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*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) + 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) + void JustSummoned(Creature* summon) OVERRIDE { BossAI::JustSummoned(summon); } - void UpdateAI(uint32 diff) + 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 + 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() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_commander_sarannis_summon_reinforcements_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + 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 e17e2b460c5..1b362fe8a5a 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() + void Reset() OVERRIDE { Adds_List.clear(); @@ -85,12 +85,12 @@ class boss_high_botanist_freywinn : public CreatureScript MoveFree = true; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) + 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*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -200,7 +200,7 @@ class boss_high_botanist_freywinn : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + 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 14126f539ff..fe9e7d87008 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() + 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*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon && me->GetVictim()) summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -213,7 +213,7 @@ class boss_laj : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + 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 70b626190b7..d2a1b294698 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() + void Reset() OVERRIDE { _Reset(); _phase1 = true; _phase2 = true; } - void EnterCombat(Unit* /*who*/) + 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*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) + 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) + 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 + 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 5bb91b384a1..d3fe23353e7 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -81,16 +81,17 @@ class npc_warp_splinter_treant : public CreatureScript uint64 WarpGuid; uint32 check_Timer; - void Reset() + void Reset() OVERRIDE { check_Timer = 0; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -118,7 +119,7 @@ class npc_warp_splinter_treant : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_warp_splinter_treantAI(creature); } @@ -150,7 +151,7 @@ class boss_warp_splinter : public CreatureScript float Treant_Spawn_Pos_X; float Treant_Spawn_Pos_Y; - void Reset() + void Reset() OVERRIDE { War_Stomp_Timer = urand(25000, 40000); Summon_Treants_Timer = 45000; @@ -159,17 +160,17 @@ class boss_warp_splinter : public CreatureScript me->SetSpeed(MOVE_RUN, 0.7f, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } @@ -190,7 +191,7 @@ class boss_warp_splinter : public CreatureScript Talk(SAY_SUMMON); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -226,7 +227,7 @@ class boss_warp_splinter : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + 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 69b95e8c813..443a8aa55fa 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp @@ -59,7 +59,7 @@ class instance_the_botanica : public InstanceMapScript } } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -152,7 +152,7 @@ class instance_the_botanica : public InstanceMapScript uint64 WarpSplinterGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + 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 0e66893d3ac..943838ae85d 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() + 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() + void JustRespawned() OVERRIDE { Talk(SAY_INTRO); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* victim) + 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*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) + 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 + 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*/) + 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() + 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 + 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 33896800ada..ccce7450923 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() + 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) + void KilledUnit(Unit* victim) OVERRIDE { victim->CastSpell(victim, SPELL_MARK_DEATH, 0); @@ -80,24 +80,25 @@ class boss_doomwalker : public CreatureScript Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsValidAttackTarget(who)) if (who->HasAura(SPELL_MARK_DEATH, 0)) who->CastSpell(who, SPELL_AURA_DEATH, 1); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -158,7 +159,7 @@ class boss_doomwalker : public CreatureScript bool _inEnrage; }; - CreatureAI* GetAI(Creature* creature) const + 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 c10f119f00f..1321b1457f1 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -60,7 +60,7 @@ class npc_bladespire_ogre : public CreatureScript public: npc_bladespire_ogre() : CreatureScript("npc_bladespire_ogre") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bladespire_ogreAI (creature); } @@ -69,9 +69,9 @@ public: { npc_bladespire_ogreAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } + void Reset() OVERRIDE {} - void UpdateAI(uint32 /*uiDiff*/) + void UpdateAI(uint32 /*uiDiff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -112,7 +112,7 @@ class npc_nether_drake : public CreatureScript public: npc_nether_drake() : CreatureScript("npc_nether_drake") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_nether_drakeAI (creature); } @@ -129,7 +129,7 @@ public: uint32 ManaBurn_Timer; uint32 IntangiblePresence_Timer; - void Reset() + void Reset() OVERRIDE { IsNihil = false; NihilSpeech_Timer = 3000; @@ -140,9 +140,10 @@ public: IntangiblePresence_Timer = 15000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -151,7 +152,7 @@ public: } //in case Creature was not summoned (not expected) - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -164,7 +165,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_T_PHASE_MODULATOR && caster->GetTypeId() == TYPEID_PLAYER) { @@ -195,7 +196,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsNihil) { @@ -276,7 +277,7 @@ class npc_daranelle : public CreatureScript public: npc_daranelle() : CreatureScript("npc_daranelle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_daranelleAI (creature); } @@ -285,11 +286,12 @@ public: { npc_daranelleAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } + void Reset() OVERRIDE {} + + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (who->GetTypeId() == TYPEID_PLAYER) { @@ -317,7 +319,7 @@ class npc_overseer_nuaar : public CreatureScript public: npc_overseer_nuaar() : CreatureScript("npc_overseer_nuaar") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -328,7 +330,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -351,7 +353,7 @@ class npc_saikkal_the_elder : public CreatureScript public: npc_saikkal_the_elder() : CreatureScript("npc_saikkal_the_elder") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -368,7 +370,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_STE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -388,7 +390,7 @@ class go_legion_obelisk : public GameObjectScript public: go_legion_obelisk() : GameObjectScript("go_legion_obelisk") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (player->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE) { @@ -445,7 +447,7 @@ class npc_bloodmaul_brutebane : public CreatureScript public: npc_bloodmaul_brutebane() : CreatureScript("npc_bloodmaul_brutebane") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bloodmaul_brutebaneAI(creature); } @@ -463,12 +465,12 @@ public: uint64 OgreGUID; - void Reset() + void Reset() OVERRIDE { OgreGUID = 0; } - void UpdateAI(uint32 /*uiDiff*/) {} + void UpdateAI(uint32 /*uiDiff*/) OVERRIDE {} }; }; @@ -481,7 +483,7 @@ class npc_ogre_brute : public CreatureScript public: npc_ogre_brute() : CreatureScript("npc_ogre_brute") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ogre_bruteAI(creature); } @@ -492,12 +494,13 @@ public: uint64 PlayerGUID; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || (!who->IsAlive())) return; @@ -511,7 +514,7 @@ public: } } - void MovementInform(uint32 /*type*/, uint32 id) + void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE { Player* player = Unit::GetPlayer(*me, PlayerGUID); if (id == 1) @@ -528,7 +531,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -552,7 +555,7 @@ class go_thunderspike : public GameObjectScript public: go_thunderspike() : GameObjectScript("go_thunderspike") { } - bool OnGossipHello(Player* player, GameObject* go) + 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)) @@ -654,7 +657,7 @@ class npc_simon_bunny : public CreatureScript EventMap _events; std::list<uint8> colorSequence, playableSequence, playerSequence; - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -708,7 +711,7 @@ class npc_simon_bunny : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -734,7 +737,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*/) + void SetData(uint32 type, uint32 /*data*/) OVERRIDE { if (!listening) return; @@ -757,7 +760,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) + void SetGUID(uint64 guid, int32 id) OVERRIDE { me->SetCanFly(true); @@ -1047,7 +1050,7 @@ class npc_simon_bunny : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) + 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 @@ -1079,7 +1082,7 @@ class npc_simon_bunny : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_simon_bunnyAI(creature); } @@ -1090,7 +1093,7 @@ class go_simon_cluster : public GameObjectScript public: go_simon_cluster() : GameObjectScript("go_simon_cluster") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (Creature* bunny = go->FindNearestCreature(NPC_SIMON_BUNNY, 12.0f, true)) bunny->AI()->SetData(go->GetEntry(), 0); @@ -1116,14 +1119,14 @@ class go_apexis_relic : public GameObjectScript public: go_apexis_relic() : GameObjectScript("go_apexis_relic") { } - bool OnGossipHello(Player* player, GameObject* go) + 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*/) + bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 /*action*/) OVERRIDE { player->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 7cbc48966ae..3f1266701db 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -61,7 +61,7 @@ class npc_aeranas : public CreatureScript public: npc_aeranas() : CreatureScript("npc_aeranas") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_aeranasAI (creature); } @@ -74,7 +74,7 @@ public: uint32 EnvelopingWinds_Timer; uint32 Shock_Timer; - void Reset() + void Reset() OVERRIDE { Faction_Timer = 8000; EnvelopingWinds_Timer = 9000; @@ -86,7 +86,7 @@ public: Talk(SAY_SUMMON); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Faction_Timer) { @@ -148,7 +148,7 @@ class npc_ancestral_wolf : public CreatureScript public: npc_ancestral_wolf() : CreatureScript("npc_ancestral_wolf") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ancestral_wolfAI(creature); } @@ -168,13 +168,14 @@ public: Creature* pRyga; - void Reset() + void Reset() OVERRIDE { pRyga = NULL; DoCast(me, SPELL_ANCESTRAL_WOLF_BUFF, true); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!pRyga && who->GetEntry() == NPC_RYGA && me->IsWithinDistInMap(who, 15.0f)) if (Creature* temp = who->ToCreature()) @@ -183,7 +184,7 @@ public: npc_escortAI::MoveInLineOfSight(who); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -218,7 +219,7 @@ class npc_naladu : public CreatureScript public: npc_naladu() : CreatureScript("npc_naladu") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -227,7 +228,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -257,7 +258,7 @@ class npc_tracy_proudwell : public CreatureScript public: npc_tracy_proudwell() : CreatureScript("npc_tracy_proudwell") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -277,7 +278,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -313,7 +314,7 @@ class npc_trollbane : public CreatureScript public: npc_trollbane() : CreatureScript("npc_trollbane") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -333,7 +334,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -366,7 +367,7 @@ class npc_wounded_blood_elf : public CreatureScript public: npc_wounded_blood_elf() : CreatureScript("npc_wounded_blood_elf") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH) { @@ -380,7 +381,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_wounded_blood_elfAI(creature); } @@ -389,7 +390,7 @@ public: { npc_wounded_blood_elfAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -423,15 +424,15 @@ public: } } - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING)) Talk(SAY_ELF_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } @@ -454,7 +455,7 @@ class npc_fel_guard_hound : public CreatureScript public: npc_fel_guard_hound() : CreatureScript("npc_fel_guard_hound") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fel_guard_houndAI(creature); } @@ -466,13 +467,13 @@ public: uint32 uiCheckTimer; uint64 uiHelboarGUID; - void Reset() + void Reset() OVERRIDE { uiCheckTimer = 5000; //check for creature every 5 sec uiHelboarGUID = 0; } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 uiId) OVERRIDE { if (uiType != POINT_MOTION_TYPE || uiId != 1) return; @@ -487,7 +488,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (uiCheckTimer <= uiDiff) { diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index c4b651c22ce..4269c69cfe0 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) + 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) + 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) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_H) { @@ -199,7 +199,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_maghar_captiveAI(creature); } @@ -212,19 +212,19 @@ public: uint32 m_uiHealTimer; uint32 m_uiFrostShockTimer; - void Reset() + void Reset() OVERRIDE { m_uiChainLightningTimer = 1000; m_uiHealTimer = 0; m_uiFrostShockTimer = 6000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_EARTHBIND_TOTEM, false); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -249,7 +249,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_MURK_BRUTE) summoned->AI()->Talk(SAY_MAG_NO_ESCAPE); @@ -263,7 +263,7 @@ public: } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) + void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) OVERRIDE { if (pSpell->Id == SPELL_CHAIN_LIGHTNING) { @@ -274,7 +274,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); if (!me->GetVictim()) @@ -321,7 +321,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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_creditmarker_visit_with_ancestorsAI (creature); } @@ -330,11 +330,12 @@ public: { npc_creditmarker_visit_with_ancestorsAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!who) return; @@ -384,7 +385,7 @@ class go_corkis_prison : public GameObjectScript public: go_corkis_prison() : GameObjectScript("go_corkis_prison") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->SetGoState(GO_STATE_READY); if (go->GetEntry() == GO_CORKIS_PRISON) @@ -425,7 +426,7 @@ class npc_corki : public CreatureScript public: npc_corki() : CreatureScript("npc_corki") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_corkiAI(creature); } @@ -437,13 +438,13 @@ public: uint32 Say_Timer; bool ReleasedFromCage; - void Reset() + void Reset() OVERRIDE { Say_Timer = 5000; ReleasedFromCage = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (ReleasedFromCage) { @@ -457,7 +458,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == 1) { @@ -509,7 +510,7 @@ class npc_kurenai_captive : public CreatureScript public: npc_kurenai_captive() : CreatureScript("npc_kurenai_captive") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_A) { @@ -527,7 +528,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kurenai_captiveAI(creature); } @@ -540,19 +541,19 @@ public: uint32 HealTimer; uint32 FrostShockTimer; - void Reset() + void Reset() OVERRIDE { ChainLightningTimer = 1000; HealTimer = 0; FrostShockTimer = 6000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_KUR_EARTHBIND_TOTEM, false); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -564,7 +565,7 @@ public: } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -593,7 +594,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_KUR_MURK_BRUTE) Talk(SAY_KUR_NO_ESCAPE); @@ -607,7 +608,7 @@ public: summoned->AI()->AttackStart(me); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) + void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_KUR_CHAIN_LIGHTNING) { @@ -626,7 +627,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -677,7 +678,7 @@ class go_warmaul_prison : public GameObjectScript public: go_warmaul_prison() : GameObjectScript("go_warmaul_prison") { } - bool OnGossipHello(Player* player, GameObject* go) + 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 a3f959c58b6..553817f01d8 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_manaforge_control_consoleAI (creature); } @@ -91,7 +91,7 @@ public: uint64 goConsole; Creature* add; - void Reset() + void Reset() OVERRIDE { Event_Timer = 3000; Wave_Timer = 0; @@ -102,9 +102,9 @@ public: add = NULL; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - /*void SpellHit(Unit* caster, const SpellInfo* spell) + /*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*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(EMOTE_ABORT); @@ -234,7 +234,7 @@ public: } } - void UpdateAI(uint32 diff) + 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) + 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_commander_dawnforgeAI(creature); } @@ -414,7 +414,7 @@ public: float angle_dawnforge; float angle_ardonis; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; ardonisGUID = 0; @@ -426,9 +426,9 @@ public: isEvent = false; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { pathaleonGUID = summoned->GetGUID(); } @@ -506,7 +506,7 @@ public: return false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Is event even running? if (!isEvent) @@ -644,7 +644,7 @@ class at_commander_dawnforge : public AreaTriggerScript public: at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + 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)) @@ -687,7 +687,7 @@ public: //if (quest->GetQuestId() == QUEST_DIMENSIUS) //creature->AI()->Talk(WHISPER_DABIRI, player->GetGUID()); - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -699,7 +699,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -739,7 +739,7 @@ class npc_phase_hunter : public CreatureScript public: npc_phase_hunter() : CreatureScript("npc_phase_hunter") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_phase_hunterAI (creature); } @@ -758,7 +758,7 @@ public: uint32 ManaBurnTimer; - void Reset() + void Reset() OVERRIDE { Weak = false; Materialize = false; @@ -773,18 +773,18 @@ public: me->UpdateEntry(NPC_PHASE_HUNTER_ENTRY); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) PlayerGUID = who->GetGUID(); } - //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) + //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) OVERRIDE //{ // DoCast(me, SPELL_DE_MATERIALIZE); //} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Materialize) { @@ -865,7 +865,7 @@ class npc_bessy : public CreatureScript public: npc_bessy() : CreatureScript("npc_bessy") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == Q_ALMABTRIEB) { @@ -876,7 +876,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bessyAI(creature); } @@ -885,13 +885,13 @@ public: { npc_bessyAI(Creature* creature) : npc_escortAI(creature) {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(Q_ALMABTRIEB); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -920,12 +920,12 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void Reset() + void Reset() OVERRIDE { me->RestoreFaction(); } @@ -947,7 +947,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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_maxx_a_million_escortAI(creature); } @@ -959,13 +959,13 @@ public: bool bTake; uint32 uiTakeTimer; - void Reset() + void Reset() OVERRIDE { bTake=false; uiTakeTimer=3000; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -991,13 +991,13 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_MARK_V_IS_ALIVE); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -1021,7 +1021,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_MARK_V_IS_ALIVE) { @@ -1050,7 +1050,7 @@ class go_captain_tyralius_prison : public GameObjectScript public: go_captain_tyralius_prison() : GameObjectScript("go_captain_tyralius_prison") { } - bool OnGossipHello(Player* player, GameObject* go) + 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 a8fdf3b9034..b7cf46ad8ae 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -73,7 +73,7 @@ class npc_mature_netherwing_drake : public CreatureScript public: npc_mature_netherwing_drake() : CreatureScript("npc_mature_netherwing_drake") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mature_netherwing_drakeAI(creature); } @@ -90,7 +90,7 @@ public: uint32 EatTimer; uint32 CastTimer; - void Reset() + void Reset() OVERRIDE { uiPlayerGUID = 0; @@ -101,7 +101,7 @@ public: CastTimer = 5000; } - void SpellHit(Unit* pCaster, SpellInfo const* spell) + void SpellHit(Unit* pCaster, SpellInfo const* spell) OVERRIDE { if (bCanEat || bIsEating) return; @@ -113,7 +113,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -126,7 +126,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (bCanEat || bIsEating) { @@ -211,7 +211,7 @@ class npc_enslaved_netherwing_drake : public CreatureScript public: npc_enslaved_netherwing_drake() : CreatureScript("npc_enslaved_netherwing_drake") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_enslaved_netherwing_drakeAI(creature); } @@ -229,7 +229,7 @@ public: uint32 FlyTimer; bool Tapped; - void Reset() + void Reset() OVERRIDE { if (!Tapped) me->setFaction(FACTION_DEFAULT); @@ -239,7 +239,7 @@ public: me->SetVisible(true); } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (!caster) return; @@ -265,7 +265,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -287,7 +287,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -342,7 +342,7 @@ class npc_dragonmaw_peon : public CreatureScript public: npc_dragonmaw_peon() : CreatureScript("npc_dragonmaw_peon") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_dragonmaw_peonAI(creature); } @@ -355,14 +355,14 @@ public: bool Tapped; uint32 PoisonTimer; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; Tapped = false; PoisonTimer = 0; } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (!caster) return; @@ -380,7 +380,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -392,7 +392,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (PoisonTimer) { @@ -421,7 +421,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) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -430,7 +430,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + 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); @@ -453,7 +453,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) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -479,7 +479,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + 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); @@ -510,7 +510,7 @@ class npc_murkblood_overseer : public CreatureScript public: npc_murkblood_overseer() : CreatureScript("npc_murkblood_overseer") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -550,7 +550,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_11082) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(0, GOSSIP_HMO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -577,7 +577,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) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -617,7 +617,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -654,7 +654,7 @@ class npc_karynaku : public CreatureScript public: npc_karynaku() : CreatureScript("npc_karynaku") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ALLY_OF_NETHER) player->ActivateTaxiPathTo(TAXI_PATH_ID); @@ -708,7 +708,7 @@ class npc_overlord_morghor : public CreatureScript public: npc_overlord_morghor() : CreatureScript("npc_overlord_morghor") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest *_Quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest *_Quest) OVERRIDE { if (_Quest->GetQuestId() == QUEST_LORD_ILLIDAN_STORMRAGE) { @@ -719,7 +719,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_overlord_morghorAI(creature); } @@ -736,7 +736,7 @@ public: bool Event; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; IllidanGUID = 0; @@ -969,7 +969,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!ConversationTimer) return; @@ -1012,7 +1012,7 @@ class npc_earthmender_wilda : public CreatureScript public: npc_earthmender_wilda() : CreatureScript("npc_earthmender_wilda") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ESCAPE_COILSCAR) { @@ -1025,7 +1025,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_earthmender_wildaAI(creature); } @@ -1036,12 +1036,12 @@ public: uint32 m_uiHealingTimer; - void Reset() + void Reset() OVERRIDE { m_uiHealingTimer = 0; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -1099,7 +1099,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_COILSKAR_ASSASSIN) summoned->AI()->AttackStart(me); @@ -1117,7 +1117,7 @@ public: DoSummon(NPC_COILSKAR_ASSASSIN, me, 15.0f, 5000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { //don't always use if (rand()%5) @@ -1132,7 +1132,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -1255,7 +1255,7 @@ class npc_torloth_the_magnificent : public CreatureScript public: npc_torloth_the_magnificent() : CreatureScript("npc_torloth_the_magnificent") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_torloth_the_magnificentAI(c); } @@ -1273,7 +1273,7 @@ public: bool Timers; - void Reset() + void Reset() OVERRIDE { AnimationTimer = 4000; AnimationCount = 0; @@ -1286,7 +1286,7 @@ public: me->SetTarget(0); } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} void HandleAnimation() { @@ -1333,7 +1333,7 @@ public: ++AnimationCount; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (AnimationTimer) { @@ -1378,7 +1378,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { switch (killer->GetTypeId()) { @@ -1410,7 +1410,7 @@ class npc_lord_illidan_stormrage : public CreatureScript public: npc_lord_illidan_stormrage() : CreatureScript("npc_lord_illidan_stormrage") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_lord_illidan_stormrageAI(c); } @@ -1431,7 +1431,7 @@ public: bool Announced; bool Failed; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; @@ -1447,9 +1447,10 @@ public: me->SetVisible(false); } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void AttackStart(Unit* /*who*/) OVERRIDE {} void SummonNextWave(); @@ -1520,7 +1521,7 @@ public: Announced = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!PlayerGUID || !EventStarted) return; @@ -1558,7 +1559,7 @@ class npc_illidari_spawn : public CreatureScript public: npc_illidari_spawn() : CreatureScript("npc_illidari_spawn") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_illidari_spawnAI(c); } @@ -1571,15 +1572,15 @@ public: uint32 SpellTimer1, SpellTimer2, SpellTimer3; bool Timers; - void Reset() + void Reset() OVERRIDE { LordIllidanGUID = 0; Timers = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->RemoveCorpse(); if (Creature* LordIllidan = (Unit::GetCreature(*me, LordIllidanGUID))) @@ -1587,7 +1588,7 @@ public: CAST_AI(npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI, LordIllidan->AI())->LiveCounter(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1744,7 +1745,7 @@ class go_crystal_prison : public GameObjectScript public: go_crystal_prison() : GameObjectScript("go_crystal_prison") { } - bool OnQuestAccept(Player* player, GameObject* /*go*/, Quest const* quest) + bool OnQuestAccept(Player* player, GameObject* /*go*/, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_BATTLE_OF_THE_CRIMSON_WATCH) { @@ -1813,7 +1814,7 @@ class npc_enraged_spirit : public CreatureScript public: npc_enraged_spirit() : CreatureScript("npc_enraged_spirit") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_enraged_spiritAI(creature); } @@ -1822,11 +1823,11 @@ public: { npc_enraged_spiritAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { // always spawn spirit on death // if totem around @@ -1908,13 +1909,13 @@ class spell_unlocking_zuluheds_chains : public SpellScriptLoader GetCaster()->ToPlayer()->CastedCreatureOrGO(NPC_KARYNAKU, karynaku->GetGUID(), GetSpellInfo()->Id); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_unlocking_zuluheds_chains_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_unlocking_zuluheds_chains_SpellScript(); } @@ -1942,14 +1943,14 @@ public: { npc_shadowmoon_tuber_nodeAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { tapped = false; tuberGUID = 0; resetTimer = 60000; } - void SetData(uint32 id, uint32 data) + void SetData(uint32 id, uint32 data) OVERRIDE { if (id == TYPE_BOAR && data == DATA_BOAR) { @@ -1966,7 +1967,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (!tapped && spell->Id == SPELL_WHISTLE) { @@ -1980,7 +1981,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (tapped) { @@ -2004,7 +2005,7 @@ public: uint32 resetTimer; }; - CreatureAI* GetAI(Creature* creature) const + 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 0241a5cb4ed..a391ec03228 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) + 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) + 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 + 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() + void Reset() OVERRIDE { Uppercut_Timer = 5000; me->RestoreFaction(); } - void UpdateAI(uint32 diff) + 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) + 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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_salsalabimAI (creature); } @@ -166,13 +166,13 @@ public: uint32 MagneticPull_Timer; - void Reset() + void Reset() OVERRIDE { MagneticPull_Timer = 15000; me->RestoreFaction(); } - void DamageTaken(Unit* done_by, uint32 &damage) + 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) + 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) + 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) + 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) + 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) + 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 + 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) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -411,7 +411,8 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -427,7 +428,7 @@ public: } } - void Reset() { } + void Reset() OVERRIDE {} }; }; @@ -443,7 +444,7 @@ class npc_ishanah : public CreatureScript public: npc_ishanah() : CreatureScript("npc_ishanah") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -454,7 +455,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -484,7 +485,7 @@ class npc_khadgar : public CreatureScript public: npc_khadgar() : CreatureScript("npc_khadgar") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -521,7 +522,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + 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 45ff3477307..34763d8946c 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 + 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() + void Reset() OVERRIDE { CanDoQuest = false; UnkorUnfriendly_Timer = 0; @@ -83,7 +83,7 @@ public: me->setFaction(FACTION_HOSTILE); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void DoNice() { @@ -96,7 +96,7 @@ public: UnkorUnfriendly_Timer = 60000; } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { Player* player = done_by->ToPlayer(); @@ -126,7 +126,7 @@ public: } } - void UpdateAI(uint32 diff) + 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 + 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() { } - void EnterCombat(Unit* /*who*/) { } + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void DamageTaken(Unit* done_by, uint32 &damage) + 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 + 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) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -223,9 +223,10 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -236,9 +237,9 @@ public: Start(false, false, who->GetGUID()); } - void Reset() { } + void Reset() OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); } @@ -254,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 + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_rotting_forest_ragerAI (creature); } @@ -263,10 +264,10 @@ public: { npc_rotting_forest_ragerAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } - void EnterCombat(Unit* /*who*/) { } + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by->GetTypeId() == TYPEID_PLAYER) if (me->GetHealth() <= damage) @@ -297,7 +298,7 @@ class npc_netherweb_victim : public CreatureScript public: npc_netherweb_victim() : CreatureScript("npc_netherweb_victim") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_netherweb_victimAI (creature); } @@ -306,11 +307,12 @@ public: { npc_netherweb_victimAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } - void EnterCombat(Unit* /*who*/) { } - void MoveInLineOfSight(Unit* /*who*/) { } + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { Player* player = killer->ToPlayer(); if (!player) @@ -359,7 +361,7 @@ class npc_floon : public CreatureScript public: npc_floon() : CreatureScript("npc_floon") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -377,7 +379,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + 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); @@ -386,7 +388,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_floonAI (creature); } @@ -403,7 +405,7 @@ public: uint32 Frostbolt_Timer; uint32 FrostNova_Timer; - void Reset() + void Reset() OVERRIDE { Silence_Timer = 2000; Frostbolt_Timer = 4000; @@ -412,9 +414,9 @@ public: me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -467,7 +469,7 @@ public: { npc_isla_starmaneAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -506,12 +508,12 @@ public: } } - void Reset() + void Reset() OVERRIDE { me->RestoreFaction(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -523,7 +525,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_EFTW_H || quest->GetQuestId() == QUEST_EFTW_A) { @@ -533,7 +535,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_isla_starmaneAI(creature); } @@ -552,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) + bool OnGossipSelect(Player* player, GameObject* go, uint32 sender, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (sender) @@ -562,7 +564,7 @@ public: return true; } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if ((player->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) || player->GetQuestRewardStatus(11885)) { @@ -610,7 +612,7 @@ class npc_slim : public CreatureScript public: npc_slim() : CreatureScript("npc_slim") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -619,7 +621,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsVendor() && player->GetReputationRank(FACTION_CONSORTIUM) >= REP_FRIENDLY) { @@ -648,7 +650,7 @@ class npc_akuno : public CreatureScript public: npc_akuno() : CreatureScript("npc_akuno") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ESCAPING_THE_TOMB) { @@ -663,7 +665,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_akunoAI(creature); } @@ -672,7 +674,7 @@ public: { npc_akunoAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -691,7 +693,7 @@ public: } } - void JustSummoned(Creature* summon) + 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 9a70896f44b..8bacc778f4b 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) + 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) + 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() + void Reset() OVERRIDE { LightningBolt_Timer = 2000; if (me->getFaction() != m_uiNormFaction) me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -207,12 +207,12 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_cooshcooshAI (creature); } - bool OnGossipHello(Player* player, Creature* creature) + 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) + 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) + 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) + 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) + 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) + 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() { } + void Reset() OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -379,7 +379,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + 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 + 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) + 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) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) |