diff options
47 files changed, 366 insertions, 366 deletions
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp index d22ce24083b..01104a47f30 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp @@ -93,14 +93,14 @@ class boss_alizabal : public CreatureScript bool Hate; bool Skewer; - void Reset() + void Reset() OVERRIDE { _Reset(); Hate = false; Skewer = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -108,27 +108,27 @@ class boss_alizabal : public CreatureScript events.ScheduleEvent(EVENT_RANDOM_CAST, 10000); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); me->GetMotionMaster()->MoveTargetedHome(); _DespawnAtEvade(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -142,7 +142,7 @@ class boss_alizabal : public CreatureScript } } - void MovementInform(uint32 /*type*/, uint32 pointId) + void MovementInform(uint32 /*type*/, uint32 pointId) OVERRIDE { switch (pointId) { @@ -152,7 +152,7 @@ class boss_alizabal : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -258,7 +258,7 @@ class boss_alizabal : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_alizabalAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 12e80339ce6..386b8818d5f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -39,30 +39,30 @@ class boss_akilzon : public CreatureScript { boss_akilzonAI(Creature* creature) : BossAI(creature, DATA_AKILZON) { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); _JustDied(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_PLAYER_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -86,7 +86,7 @@ class boss_akilzon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulAmanAI<boss_akilzonAI>(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp index 64237502803..10d3dc821e8 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp @@ -54,30 +54,30 @@ class boss_daakara : public CreatureScript { boss_daakaraAI(Creature* creature) : BossAI(creature, DATA_DAAKARA) { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); _JustDied(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_PLAYER_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -101,7 +101,7 @@ class boss_daakara : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulAmanAI<boss_daakaraAI>(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 76c6917c3ce..81f149b9351 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -47,30 +47,30 @@ class boss_halazzi : public CreatureScript { boss_halazziAI(Creature* creature) : BossAI(creature, DATA_HALAZZI) { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); _JustDied(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_PLAYER_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -94,7 +94,7 @@ class boss_halazzi : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulAmanAI<boss_halazziAI>(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 5b1d194eb08..8d9d1b5d5aa 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -51,30 +51,30 @@ class boss_hexlord_malacrass : public CreatureScript { boss_hex_lord_malacrassAI(Creature* creature) : BossAI(creature, DATA_HEXLORD) { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); _JustDied(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_PLAYER_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -98,7 +98,7 @@ class boss_hexlord_malacrass : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulAmanAI<boss_hex_lord_malacrassAI>(creature); } @@ -113,7 +113,7 @@ class spell_hexlord_unstable_affliction : public SpellScriptLoader { PrepareAuraScript(spell_hexlord_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WL_UNSTABLE_AFFL_DISPEL)) return false; @@ -126,13 +126,13 @@ class spell_hexlord_unstable_affliction : public SpellScriptLoader caster->CastSpell(dispelInfo->GetDispeller(), SPELL_WL_UNSTABLE_AFFL_DISPEL, true, NULL, GetEffect(EFFECT_0)); } - void Register() + void Register() OVERRIDE { AfterDispel += AuraDispelFn(spell_hexlord_unstable_affliction_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hexlord_unstable_affliction_AuraScript(); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 0521fb28101..861c2921cd3 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -48,30 +48,30 @@ class boss_janalai : public CreatureScript { boss_janalaiAI(Creature* creature) : BossAI(creature, DATA_JANALAI) { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); _JustDied(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_PLAYER_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -95,7 +95,7 @@ class boss_janalai : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulAmanAI<boss_janalaiAI>(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 444b6447f60..fe7f99cebe9 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -53,30 +53,30 @@ class boss_nalorakk : public CreatureScript { boss_nalorakkAI(Creature* creature) : BossAI(creature, DATA_NALORAKK) { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); _JustDied(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_PLAYER_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -100,7 +100,7 @@ class boss_nalorakk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_nalorakkAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index cfbbc53805f..c34c064fc3e 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -113,7 +113,7 @@ class instance_zulaman : public InstanceMapScript } } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -142,7 +142,7 @@ class instance_zulaman : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -164,7 +164,7 @@ class instance_zulaman : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -339,7 +339,7 @@ class instance_zulaman : public InstanceMapScript uint32 ZulAmanBossCount; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_zulaman_InstanceScript(map); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 8e424ef3ac4..461e66628c2 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -92,12 +92,12 @@ class npc_voljin_zulaman : public CreatureScript me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void Reset() + void Reset() OVERRIDE { _gongCount = 0; } - void sGossipSelect(Player* player, uint32 sender, uint32 action) + void sGossipSelect(Player* player, uint32 sender, uint32 action) OVERRIDE { if (_instance->GetData(DATA_ZULAMAN_STATE) != NOT_STARTED) return; @@ -114,7 +114,7 @@ class npc_voljin_zulaman : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_START_ZULAMAN) { @@ -123,7 +123,7 @@ class npc_voljin_zulaman : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -184,7 +184,7 @@ class npc_voljin_zulaman : public CreatureScript } } - void MovementInform(uint32 movementType, uint32 pointId) + void MovementInform(uint32 movementType, uint32 pointId) OVERRIDE { if (movementType != POINT_MOTION_TYPE) return; @@ -212,7 +212,7 @@ class npc_voljin_zulaman : public CreatureScript uint8 _gongCount; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulAmanAI<npc_voljin_zulamanAI>(creature); } @@ -234,13 +234,13 @@ class spell_banging_the_gong : public SpellScriptLoader GetHitGObj()->SendCustomAnim(0); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_banging_the_gong_SpellScript::Activate, EFFECT_1, SPELL_EFFECT_ACTIVATE_OBJECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_banging_the_gong_SpellScript(); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index c3bfa008c08..77e447292cc 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -44,19 +44,19 @@ class boss_grilek : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -80,7 +80,7 @@ class boss_grilek : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_grilekAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index 8889af46b81..fa49623ec02 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -44,19 +44,19 @@ class boss_hazzarah : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -80,7 +80,7 @@ class boss_hazzarah : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_hazzarahAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp index d3fff5d710e..d654e7a638c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp @@ -57,22 +57,22 @@ class boss_jindo_the_godbreaker : public CreatureScript { boss_jindo_the_godbreakerAI(Creature* creature) : BossAI(creature, DATA_JINDO) { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -96,7 +96,7 @@ class boss_jindo_the_godbreaker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulGurubAI<boss_jindo_the_godbreakerAI>(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp index eab9722b280..ea2e63d5086 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp @@ -48,30 +48,30 @@ class boss_kilnara : public CreatureScript { boss_kilnaraAI(Creature* creature) : BossAI(creature, DATA_KILNARA) { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_PLAYER_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -95,7 +95,7 @@ class boss_kilnara : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulGurubAI<boss_kilnaraAI>(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index d7949e01184..bf826e70ca2 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -109,7 +109,7 @@ class boss_mandokir : public CreatureScript { boss_mandokirAI(Creature* creature) : BossAI(creature, DATA_MANDOKIR) { } - void Reset() + void Reset() OVERRIDE { DoCastAOE(SPELL_SPIRIT_VENGEANCE_CANCEL); @@ -121,7 +121,7 @@ class boss_mandokir : public CreatureScript _reviveGUID = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -144,14 +144,14 @@ class boss_mandokir : public CreatureScript events.ScheduleEvent(EVENT_DEVASTATING_SLAM, 25000); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCastAOE(SPELL_SPIRIT_VENGEANCE_CANCEL); _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) { @@ -162,7 +162,7 @@ class boss_mandokir : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (me->HealthBelowPctDamaged(20, damage) && !me->HasAura(SPELL_FRENZY)) { @@ -172,7 +172,7 @@ class boss_mandokir : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -207,7 +207,7 @@ class boss_mandokir : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_OHGANOT_SO_FAST) return _ohganotSoFast; @@ -215,12 +215,12 @@ class boss_mandokir : public CreatureScript return 0; } - void SetGUID(uint64 guid, int32 /*type = 0 */) + void SetGUID(uint64 guid, int32 /*type = 0 */) OVERRIDE { _reviveGUID = guid; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -283,7 +283,7 @@ class boss_mandokir : public CreatureScript uint64 _reviveGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulGurubAI<boss_mandokirAI>(creature); } @@ -301,12 +301,12 @@ class npc_ohgan : public CreatureScript _instance = me->GetInstanceScript(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCastAOE(SPELL_OHGAN_ORDERS, true); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (damage >= me->GetHealth()) { @@ -322,7 +322,7 @@ class npc_ohgan : public CreatureScript } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (Creature* creature = victim->ToCreature()) { @@ -331,7 +331,7 @@ class npc_ohgan : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -343,7 +343,7 @@ class npc_ohgan : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulGurubAI<npc_ohganAI>(creature); } @@ -363,17 +363,17 @@ class npc_chained_spirit : public CreatureScript me->SetReactState(REACT_PASSIVE); // correct? } - void Reset() + void Reset() OVERRIDE { _revivePlayerGUID = 0; } - void SetGUID(uint64 guid, int32 /*type = 0 */) + void SetGUID(uint64 guid, int32 /*type = 0 */) OVERRIDE { _revivePlayerGUID = guid; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_REVIVE) { @@ -386,7 +386,7 @@ class npc_chained_spirit : public CreatureScript } } - void MovementInform(uint32 type, uint32 pointId) + void MovementInform(uint32 type, uint32 pointId) OVERRIDE { if (type != POINT_MOTION_TYPE || !_revivePlayerGUID) return; @@ -400,7 +400,7 @@ class npc_chained_spirit : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Player* target = ObjectAccessor::GetPlayer(*me, _revivePlayerGUID); if (!target || target->IsAlive()) @@ -415,14 +415,14 @@ class npc_chained_spirit : public CreatureScript me->DespawnOrUnsummon(); } - void UpdateAI(uint32 /*diff*/) { } + void UpdateAI(uint32 /*diff*/) OVERRIDE { } private: InstanceScript* _instance; uint64 _revivePlayerGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulGurubAI<npc_chained_spiritAI>(creature); } @@ -454,14 +454,14 @@ class spell_mandokir_decapitate : public SpellScriptLoader caster->CastSpell(target, uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mandokir_decapitate_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_mandokir_decapitate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mandokir_decapitate_SpellScript(); } @@ -476,7 +476,7 @@ class spell_mandokir_bloodletting : public SpellScriptLoader { PrepareAuraScript(spell_mandokir_bloodletting_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BLOODLETTING_DAMAGE)) return false; @@ -498,13 +498,13 @@ class spell_mandokir_bloodletting : public SpellScriptLoader target->CastCustomSpell(caster, SPELL_BLOODLETTING_HEAL, &damage, 0, 0, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mandokir_bloodletting_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mandokir_bloodletting_AuraScript(); } @@ -525,14 +525,14 @@ class spell_mandokir_spirit_vengeance_cancel : public SpellScriptLoader target->RemoveAura(uint32(GetEffectValue())); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_mandokir_spirit_vengeance_cancel_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_mandokir_spirit_vengeance_cancel_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mandokir_spirit_vengeance_cancel_SpellScript(); } @@ -603,14 +603,14 @@ class spell_mandokir_devastating_slam : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mandokir_devastating_slam_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_mandokir_devastating_slam_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mandokir_devastating_slam_SpellScript(); } @@ -642,14 +642,14 @@ class spell_mandokir_ohgan_orders : public SpellScriptLoader caster->CastSpell(target, uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mandokir_ohgan_orders_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); OnEffectHitTarget += SpellEffectFn(spell_mandokir_ohgan_orders_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mandokir_ohgan_orders_SpellScript(); } @@ -678,13 +678,13 @@ class spell_mandokir_ohgan_orders_trigger : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_mandokir_ohgan_orders_trigger_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mandokir_ohgan_orders_trigger_AuraScript(); } @@ -709,13 +709,13 @@ class spell_mandokir_reanimate_ohgan : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_mandokir_reanimate_ohgan_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mandokir_reanimate_ohgan_SpellScript(); } @@ -736,13 +736,13 @@ class spell_clear_all : public SpellScriptLoader caster->RemoveAllAurasOnDeath(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_clear_all_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_clear_all_SpellScript(); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index e444f2f1c39..3535b18616c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -44,19 +44,19 @@ class boss_renataki : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -80,7 +80,7 @@ class boss_renataki : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_renatakiAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 0e8a37c43c3..ec649a31ade 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -51,30 +51,30 @@ class boss_venoxis : public CreatureScript { boss_venoxisAI(Creature* creature) : BossAI(creature, DATA_VENOXIS) { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_PLAYER_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -98,7 +98,7 @@ class boss_venoxis : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulGurubAI<boss_venoxisAI>(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 0dbfad612a8..a82e6c526ed 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -44,19 +44,19 @@ class boss_wushoolay : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -80,7 +80,7 @@ class boss_wushoolay : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_wushoolayAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp index f4b8cc980d4..30972ca28bb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp @@ -50,30 +50,30 @@ class boss_zanzil : public CreatureScript { boss_zanzilAI(Creature* creature) : BossAI(creature, DATA_ZANZIL) { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_PLAYER_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -97,7 +97,7 @@ class boss_zanzil : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulGurubAI<boss_zanzilAI>(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index 07655ea110c..7efc62dcfe7 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -149,14 +149,14 @@ class instance_zulgurub : public InstanceMapScript } /* - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -166,7 +166,7 @@ class instance_zulgurub : public InstanceMapScript } */ - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -254,7 +254,7 @@ class instance_zulgurub : public InstanceMapScript uint64 jindoTiggerGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_zulgurub_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index 8373b20bc66..a5db2968b7a 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -77,7 +77,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_00x09hlAI(creature); } @@ -139,7 +139,7 @@ public: Talk(SAY_OOX_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); } diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index 5c7ff632c3e..2fda8f70b5d 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -128,7 +128,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_deathstalker_erlandAI(creature); } diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 655fa65f2f2..25bc683edcf 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -152,7 +152,7 @@ class npc_winterfin_playmate : public CreatureScript { npc_winterfin_playmateAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { timer = 0; phase = 0; @@ -174,7 +174,7 @@ class npc_winterfin_playmate : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!phase) return; @@ -233,7 +233,7 @@ class npc_winterfin_playmate : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_winterfin_playmateAI(creature); } @@ -251,7 +251,7 @@ class npc_snowfall_glade_playmate : public CreatureScript { npc_snowfall_glade_playmateAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { timer = 0; phase = 0; @@ -273,7 +273,7 @@ class npc_snowfall_glade_playmate : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!phase) return; @@ -352,7 +352,7 @@ class npc_the_biggest_tree : public CreatureScript me->SetDisplayId(DISPLAY_INVISIBLE); } - void Reset() + void Reset() OVERRIDE { timer = 1000; phase = 0; @@ -374,7 +374,7 @@ class npc_the_biggest_tree : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!phase) return; @@ -421,7 +421,7 @@ class npc_the_biggest_tree : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_the_biggest_treeAI(creature); } @@ -439,7 +439,7 @@ class npc_high_oracle_soo_roo : public CreatureScript { npc_high_oracle_soo_rooAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { timer = 0; phase = 0; @@ -461,7 +461,7 @@ class npc_high_oracle_soo_roo : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!phase) return; @@ -510,7 +510,7 @@ class npc_high_oracle_soo_roo : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_high_oracle_soo_rooAI(creature); } @@ -528,7 +528,7 @@ class npc_elder_kekek : public CreatureScript { npc_elder_kekekAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { timer = 0; phase = 0; @@ -550,7 +550,7 @@ class npc_elder_kekek : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!phase) return; @@ -598,7 +598,7 @@ class npc_elder_kekek : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_elder_kekekAI(creature); } @@ -617,7 +617,7 @@ class npc_the_etymidian : public CreatureScript { npc_the_etymidianAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { timer = 0; phase = 0; @@ -639,7 +639,7 @@ class npc_the_etymidian : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!phase) return; @@ -695,7 +695,7 @@ class npc_the_etymidian : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_the_etymidianAI(creature); } @@ -713,7 +713,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript { npc_alexstraza_the_lifebinderAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { timer = 0; phase = 0; @@ -721,7 +721,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript orphanGUID = 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { // Existing SmartAI if (type == 0) @@ -761,7 +761,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!phase) return; @@ -856,7 +856,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_alexstraza_the_lifebinderAI(creature); } @@ -1009,7 +1009,7 @@ class npc_cw_area_trigger : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_cw_area_triggerAI(creature); } @@ -1044,7 +1044,7 @@ class npc_grizzlemaw_cw_trigger : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_grizzlemaw_cw_triggerAI(creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 66e276d25b6..0c918f0b0ca 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -226,7 +226,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mark_of_kazrogal_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp index e4b947d4603..e298bba53b1 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp @@ -188,12 +188,12 @@ class npc_harbinger_of_flame : public CreatureScript _events.ScheduleEvent(EVENT_FIEROCLAST_BARRAGE, 6000); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { AlysrazorTrashEvaded(me); } - void MoveInLineOfSight(Unit* unit) + void MoveInLineOfSight(Unit* unit) OVERRIDE { if (me->IsInCombat()) return; @@ -204,7 +204,7 @@ class npc_harbinger_of_flame : public CreatureScript ScriptedAI::MoveInLineOfSight(unit); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) if (!me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) @@ -242,7 +242,7 @@ class npc_harbinger_of_flame : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_harbinger_of_flameAI(creature); } @@ -259,20 +259,20 @@ class npc_blazing_monstrosity : public CreatureScript { } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { _summons.DespawnAll(); _events.Reset(); PassiveAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _summons.DespawnAll(); _events.Reset(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { AlysrazorTrashEvaded(me); } @@ -287,7 +287,7 @@ class npc_blazing_monstrosity : public CreatureScript _events.ScheduleEvent(EVENT_CONTINUE_SPITTING, 9000); } - void PassengerBoarded(Unit* passenger, int8 /*seat*/, bool apply) + void PassengerBoarded(Unit* passenger, int8 /*seat*/, bool apply) OVERRIDE { if (!apply) return; @@ -305,17 +305,17 @@ class npc_blazing_monstrosity : public CreatureScript init.Launch(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { _summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { _summons.Despawn(summon); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -344,7 +344,7 @@ class npc_blazing_monstrosity : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_blazing_monstrosityAI(creature); } @@ -361,20 +361,20 @@ class npc_molten_barrage : public CreatureScript { } - void AttackStart(Unit* target) + void AttackStart(Unit* target) OVERRIDE { if (target) me->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f, MOTION_SLOT_IDLE); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { DoCastAOE(SPELL_AGGRO_CLOSEST, true); DoCast(me, SPELL_MOLTEN_BARRAGE_VISUAL); DoCast(me, SPELL_INVISIBILITY_AND_STEALTH_DETECTION, true); } - void MovementInform(uint32 movementType, uint32 /*pointId*/) + void MovementInform(uint32 movementType, uint32 /*pointId*/) OVERRIDE { if (movementType != EFFECT_MOTION_TYPE) return; @@ -384,7 +384,7 @@ class npc_molten_barrage : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_molten_barrageAI(creature); } @@ -401,16 +401,16 @@ class npc_egg_pile : public CreatureScript { } - void AttackStart(Unit* /*target*/) { } + void AttackStart(Unit* /*target*/) OVERRIDE { } - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_PASSIVE); _events.Reset(); _callHatchlingSpell = 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _events.Reset(); std::list<Creature*> eggs; @@ -421,12 +421,12 @@ class npc_egg_pile : public CreatureScript DoCast(me, SPELL_ALYSRAZOR_COSMETIC_EGG_XPLOSION, true); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { AlysrazorTrashEvaded(me); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action != NPC_BLAZING_MONSTROSITY_LEFT && action != NPC_BLAZING_MONSTROSITY_RIGHT) @@ -441,7 +441,7 @@ class npc_egg_pile : public CreatureScript _events.ScheduleEvent(EVENT_SUMMON_SMOULDERING_HATCHLING, 1); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -487,7 +487,7 @@ class npc_egg_pile : public CreatureScript uint32 _callHatchlingSpell; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_egg_pileAI(creature); } @@ -502,7 +502,7 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_cosmetic_egg_xplosion_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sCreatureDisplayInfoStore.LookupEntry(MODEL_INVISIBLE_STALKER)) return false; @@ -517,13 +517,13 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader creature->DespawnOrUnsummon(4000); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_alysrazor_cosmetic_egg_xplosion_SpellScript::HandleExplosion, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_alysrazor_cosmetic_egg_xplosion_SpellScript(); } @@ -538,7 +538,7 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_turn_monstrosity_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_GENERIC_DUMMY_CAST)) return false; @@ -605,14 +605,14 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader GetHitUnit()->PlayOneShotAnimKit(ANIM_KIT_BIRD_TURN); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_alysrazor_turn_monstrosity_SpellScript::KnockBarrage, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_alysrazor_turn_monstrosity_SpellScript::TurnBird, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_alysrazor_turn_monstrosity_SpellScript(); } @@ -627,7 +627,7 @@ class spell_alysrazor_aggro_closest : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_aggro_closest_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -645,14 +645,14 @@ class spell_alysrazor_aggro_closest : public SpellScriptLoader GetCaster()->GetAI()->AttackStart(GetCaster()->ToCreature()->SelectVictim()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_alysrazor_aggro_closest_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); AfterCast += SpellCastFn(spell_alysrazor_aggro_closest_SpellScript::UpdateThreat); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_alysrazor_aggro_closest_SpellScript(); } @@ -667,7 +667,7 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_fieroblast_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FIRE_IT_UP)) return false; @@ -679,13 +679,13 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_FIRE_IT_UP, TRIGGERED_FULL_MASK); } - void Register() + void Register() OVERRIDE { AfterCast += SpellCastFn(spell_alysrazor_fieroblast_SpellScript::FireItUp); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_alysrazor_fieroblast_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp index dd8b2a76093..473cbb61011 100644 --- a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp @@ -35,7 +35,7 @@ class instance_firelands : public InstanceMapScript SetBossNumber(EncounterCount); } - void OnCreatureCreate(Creature* creature) + void OnCreatureCreate(Creature* creature) OVERRIDE { switch (creature->GetEntry()) { @@ -47,7 +47,7 @@ class instance_firelands : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_firelands_InstanceScript(map); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp index 953ea2b4dc2..8e88d3ce521 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp @@ -141,7 +141,7 @@ public: events.ScheduleEvent(EVENT_ANRAPHET_OMEGA_STANCE, 35000, 0, PHASE_COMBAT); } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetWalk(false); @@ -156,14 +156,14 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(ANRAPHET_SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); Talk(ANRAPHET_SAY_DEATH); @@ -174,26 +174,26 @@ public: _JustDied(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(ANRAPHET_SAY_KILL); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _JustReachedHome(); instance->SetBossState(DATA_ANRAPHET, FAIL); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_ANRAPHET_INTRO) events.ScheduleEvent(EVENT_ANRAPHET_APPEAR, 6000, 0, PHASE_INTRO); } - void MovementInform(uint32 type, uint32 point) + void MovementInform(uint32 type, uint32 point) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -205,7 +205,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if ((events.GetPhaseMask() & PHASE_MASK_COMBAT) && (!UpdateVictim() || !CheckInRoom())) return; @@ -264,7 +264,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetHallsOfOriginationAI<boss_anraphetAI>(creature); } @@ -279,15 +279,15 @@ class npc_omega_stance : public CreatureScript { npc_omega_stanceAI(Creature* creature) : ScriptedAI(creature) { } - void IsSummonedBy(Unit* /*who*/) + void IsSummonedBy(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_OMEGA_STANCE_SPIDER_TRIGGER, true); } - void EnterEvadeMode() { } + void EnterEvadeMode() OVERRIDE { } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_omega_stanceAI(creature); } @@ -302,19 +302,19 @@ class npc_alpha_beam : public CreatureScript { npc_alpha_beamAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { if (Creature* anraphet = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_ANRAPHET_GUID))) anraphet->CastSpell(me, SPELL_ALPHA_BEAMS_BACK_CAST); } - void EnterEvadeMode() { } // Never evade + void EnterEvadeMode() OVERRIDE { } // Never evade private: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetHallsOfOriginationAI<npc_alpha_beamAI>(creature); } @@ -329,7 +329,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript { npc_brann_bronzebeard_anraphetAI(Creature* creature) : CreatureAI(creature), _currentPoint(0), _instance(creature->GetInstanceScript()) { } - void sGossipSelect(Player* /*player*/, uint32 sender, uint32 action) + void sGossipSelect(Player* /*player*/, uint32 sender, uint32 action) OVERRIDE { if (_instance->GetBossState(DATA_VAULT_OF_LIGHTS) == DONE) return; @@ -346,7 +346,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -369,7 +369,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -419,7 +419,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript } } - void MovementInform(uint32 movementType, uint32 pointId) + void MovementInform(uint32 movementType, uint32 pointId) OVERRIDE { if (movementType != POINT_MOTION_TYPE) return; @@ -457,7 +457,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetHallsOfOriginationAI<npc_brann_bronzebeard_anraphetAI>(creature); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index 530255fddcd..b162463714e 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -132,7 +132,7 @@ public: player->GetSession()->SendPacket(data); } - void Reset() + void Reset() OVERRIDE { _summonDeaths = 0; _hasDispersed = false; @@ -144,7 +144,7 @@ public: events.ScheduleEvent(EVENT_EARTH_SPIKE, urand(16000, 21000), 0, PHASE_NORMAL); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (me->HealthBelowPctDamaged(50, damage) && (events.GetPhaseMask() & PHASE_MASK_NORMAL) && !_hasDispersed) { @@ -178,7 +178,7 @@ public: } } - void SetData(uint32 index, uint32 /*value*/) + void SetData(uint32 index, uint32 /*value*/) OVERRIDE { if (index == DATA_SUMMON_DEATHS) { @@ -195,14 +195,14 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); Talk(SAY_DEATH); @@ -210,14 +210,14 @@ public: Cleanup(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _JustReachedHome(); instance->SetBossState(DATA_EARTHRAGER_PTAH, FAIL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -266,7 +266,7 @@ public: bool _hasDispersed; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetHallsOfOriginationAI<boss_earthrager_ptahAI>(creature); } @@ -286,13 +286,13 @@ class spell_earthrager_ptah_flame_bolt : public SpellScriptLoader Trinity::Containers::RandomResizeList(targets, GetCaster()->GetMap()->IsHeroic() ? 3 : 2); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_earthrager_ptah_flame_bolt_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_earthrager_ptah_flame_bolt_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index 61110a3454e..6d967883646 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -93,7 +93,7 @@ public: } } - void Reset() + void Reset() OVERRIDE { _phase = PHASE_FIRST_SHIELD; _oldPhase = PHASE_FIRST_SHIELD; @@ -105,7 +105,7 @@ public: events.ScheduleEvent(EVENT_BURNING_LIGHT, 12000); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if ((me->HealthBelowPctDamaged(66, damage) && _phase == PHASE_FIRST_SHIELD) || (me->HealthBelowPctDamaged(33, damage) && _phase == PHASE_SECOND_SHIELD)) @@ -151,7 +151,7 @@ public: } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_DISABLE_BEACON) { @@ -165,34 +165,34 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); Talk(SAY_DEATH); _JustDied(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _JustReachedHome(); instance->SetBossState(DATA_TEMPLE_GUARDIAN_ANHUUR, FAIL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom() || me->GetCurrentSpell(CURRENT_CHANNELED_SPELL) || _phase == PHASE_SHIELDED) return; @@ -257,7 +257,7 @@ public: uint8 _beacons; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetHallsOfOriginationAI<boss_temple_guardian_anhuurAI>(creature); } @@ -289,13 +289,13 @@ class spell_anhuur_shield_of_light : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anhuur_shield_of_light_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_anhuur_shield_of_light_SpellScript(); } @@ -323,14 +323,14 @@ class spell_anhuur_disable_beacon_beams : public SpellScriptLoader anhuur->AI()->DoAction(ACTION_DISABLE_BEACON); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_anhuur_disable_beacon_beams_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHit += SpellEffectFn(spell_anhuur_disable_beacon_beams_SpellScript::Notify, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_anhuur_disable_beacon_beams_SpellScript(); } @@ -351,13 +351,13 @@ class spell_anhuur_activate_beacons : public SpellScriptLoader GetHitGObj()->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_anhuur_activate_beacons_SpellScript::Activate, EFFECT_0, SPELL_EFFECT_ACTIVATE_OBJECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_anhuur_activate_beacons_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp index 8c160bdc6f7..6c443097523 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp @@ -270,7 +270,7 @@ class instance_halls_of_origination : public InstanceMapScript uint32 _deadElementals; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_halls_of_origination_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index ab37f94ce40..2a996662133 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -108,7 +108,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_aged_dying_ancient_kodoAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index 6b82ee99f0a..43396722f1a 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -43,7 +43,7 @@ class npc_lazy_peon : public CreatureScript public: npc_lazy_peon() : CreatureScript("npc_lazy_peon") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lazy_peonAI(creature); } @@ -57,7 +57,7 @@ public: uint32 RebuffTimer; bool work; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; RebuffTimer = 0; @@ -86,7 +86,7 @@ public: } } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 diff) OVERRIDE { if (work == true) me->HandleEmoteCommand(EMOTE_ONESHOT_WORK_CHOPWOOD); @@ -125,7 +125,7 @@ class spell_voodoo : public SpellScriptLoader { PrepareSpellScript(spell_voodoo_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BREW) || !sSpellMgr->GetSpellInfo(SPELL_GHOSTLY) || !sSpellMgr->GetSpellInfo(SPELL_HEX1) || !sSpellMgr->GetSpellInfo(SPELL_HEX2) || @@ -142,13 +142,13 @@ class spell_voodoo : public SpellScriptLoader GetCaster()->CastSpell(target, spellid, false); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_voodoo_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_voodoo_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp index 010eaff4e22..54d1925316b 100644 --- a/src/server/scripts/Kalimdor/zone_mulgore.cpp +++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp @@ -90,7 +90,7 @@ class npc_kyle_frenzied : public CreatureScript public: npc_kyle_frenzied() : CreatureScript("npc_kyle_frenzied") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kyle_frenziedAI (creature); } @@ -105,7 +105,7 @@ public: uint32 EventTimer; uint8 EventPhase; - void Reset() + void Reset() OVERRIDE { EventActive = false; IsMovingToLunch = false; @@ -137,7 +137,7 @@ public: } } - void MovementInform(uint32 Type, uint32 PointId) + void MovementInform(uint32 type, uint32 pointId) OVERRIDE { if (Type != POINT_MOTION_TYPE || !EventActive) return; @@ -146,7 +146,7 @@ public: IsMovingToLunch = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (EventActive) { diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 82e89a18c0e..cc631df14a6 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -54,7 +54,7 @@ class npc_aquementas : public CreatureScript public: npc_aquementas() : CreatureScript("npc_aquementas") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_aquementasAI (creature); } @@ -70,7 +70,7 @@ public: uint32 FrostShockTimer; uint32 AquaJetTimer; - void Reset() + void Reset() OVERRIDE { SendItemTimer = 0; SwitchFactionTimer = 10000; @@ -102,7 +102,7 @@ public: Talk(AGGRO_YELL_AQUE, who->GetGUID()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (isFriendly) { @@ -171,7 +171,7 @@ class npc_custodian_of_time : public CreatureScript public: npc_custodian_of_time() : CreatureScript("npc_custodian_of_time") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_custodian_of_timeAI(creature); } @@ -265,10 +265,10 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void Reset() {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); } @@ -361,7 +361,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_OOX17AI(creature); } @@ -400,12 +400,12 @@ public: void Reset(){} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_OOX_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } @@ -451,7 +451,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_toogaAI(creature); } @@ -466,7 +466,7 @@ public: uint64 TortaGUID; - void Reset() + void Reset() OVERRIDE { CheckSpeechTimer = 2500; PostEventTimer = 1000; diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index 74efa2ffaff..b8430f44155 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -48,7 +48,7 @@ class npc_cairne_bloodhoof : public CreatureScript public: npc_cairne_bloodhoof() : CreatureScript("npc_cairne_bloodhoof") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_cairne_bloodhoofAI (creature); } @@ -63,7 +63,7 @@ public: uint32 ThunderclapTimer; uint32 UppercutTimer; - void Reset() + void Reset() OVERRIDE { BerserkerChargeTimer = 30000; CleaveTimer = 5000; @@ -72,9 +72,9 @@ public: UppercutTimer = 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/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index ef3162d892e..2db746baeca 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1543,7 +1543,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index 12458243286..c386c040246 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -120,7 +120,7 @@ class instance_ramparts : public InstanceMapScript bool spawned; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_ramparts_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 1d50be94bdf..808ab7c7da9 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -105,7 +105,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript Cleave_Timer = 5000; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DIE); diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index efb93a5d095..fa50d7b04ec 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -67,7 +67,7 @@ class spell_dru_eclipse_energize : public SpellScriptLoader int32 energizeAmount; - bool Load() + bool Load() OVERRIDE { if (GetCaster()->GetTypeId() != TYPEID_PLAYER) return false; @@ -153,13 +153,13 @@ class spell_dru_eclipse_energize : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dru_eclipse_energize_SpellScript::HandleEnergize, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_eclipse_energize_SpellScript; } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index bce3ec54e21..7f458c8ca84 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -3191,13 +3191,13 @@ class spell_gen_increase_stats_buff : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), GetEffectValue(), true); // single-target buff } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_increase_stats_buff_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_increase_stats_buff_SpellScript(); } @@ -3295,7 +3295,7 @@ class spell_gen_running_wild : public SpellScriptLoader target->CastSpell(target, mountCapability->SpeedModSpell, TRIGGERED_FULL_MASK); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_gen_running_wild_AuraScript::HandleMount, EFFECT_1, SPELL_AURA_MOUNTED, AURA_EFFECT_HANDLE_REAL); } @@ -3305,14 +3305,14 @@ class spell_gen_running_wild : public SpellScriptLoader { PrepareSpellScript(spell_gen_running_wild_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ALTERED_FORM)) return false; return true; } - bool Load() + bool Load() OVERRIDE { // Definitely not a good thing, but currently the only way to do something at cast start // Should be replaced as soon as possible with a new hook: BeforeCastStart @@ -3330,7 +3330,7 @@ class spell_gen_running_wild : public SpellScriptLoader return new spell_gen_running_wild_AuraScript(); } - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_running_wild_SpellScript(); } @@ -3373,14 +3373,14 @@ class spell_gen_two_forms : public SpellScriptLoader target->CastCustomSpell(SPELL_ALTERED_FORM, SPELLVALUE_BASE_POINT0, 1, target, TRIGGERED_FULL_MASK); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_gen_two_forms_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_gen_two_forms_SpellScript::HandleTransform, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_two_forms_SpellScript(); } @@ -3400,13 +3400,13 @@ class spell_gen_darkflight : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_ALTERED_FORM, TRIGGERED_FULL_MASK); } - void Register() + void Register() OVERRIDE { AfterCast += SpellCastFn(spell_gen_darkflight_SpellScript::TriggerTransform); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_darkflight_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index d18c481e63d..efb012ff3f2 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -813,7 +813,7 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader { PrepareAuraScript(spell_hun_thrill_of_the_hunt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_THRILL_OF_THE_HUNT)) return false; @@ -829,13 +829,13 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader GetTarget()->CastCustomSpell(GetTarget(), SPELL_HUNTER_THRILL_OF_THE_HUNT, &focus, NULL, NULL, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_hun_thrill_of_the_hunt_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_thrill_of_the_hunt_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index d2a9935811d..8fe628b6ba8 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -321,13 +321,13 @@ class spell_mage_cone_of_cold : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_mage_cone_of_cold_SpellScript::HandleConeOfColdScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mage_cone_of_cold_SpellScript(); } @@ -364,7 +364,7 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader { PrepareSpellScript(spell_mage_conjure_refreshment_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { for (uint8 i = 0; i < MAX_CONJURE_REFRESHMENT_SPELLS; ++i) if (!sSpellMgr->GetSpellInfo(_conjureData[i].spellId)) @@ -372,7 +372,7 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader return true; } - bool Load() + bool Load() OVERRIDE { if (GetCaster()->GetTypeId() != TYPEID_PLAYER) return false; @@ -392,13 +392,13 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_mage_conjure_refreshment_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mage_conjure_refreshment_SpellScript(); } @@ -591,7 +591,7 @@ class spell_mage_living_bomb : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_living_bomb_AuraScript(); } @@ -689,7 +689,7 @@ class spell_mage_mage_ward : public SpellScriptLoader { PrepareAuraScript(spell_mage_mage_ward_AuraScript); - void HandleAbsorb(AuraEffect* /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount) OVERRIDE + void HandleAbsorb(AuraEffect* /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount) { if (AuraEffect* aurEff = GetTarget()->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_GENERIC, ICON_MAGE_INCANTER_S_ABSORPTION, EFFECT_0)) { @@ -730,7 +730,7 @@ class spell_mage_mana_shield : public SpellScriptLoader } } - void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) OVERRIDE + void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_ENEMY_SPELL) GetTarget()->CastSpell(GetTarget(), SPELL_MAGE_INCANTERS_ABSORBTION_R1, true); @@ -805,7 +805,7 @@ class spell_mage_nether_vortex : public SpellScriptLoader { PrepareAuraScript(spell_mage_nether_vortex_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_SLOW)) return false; @@ -827,14 +827,14 @@ class spell_mage_nether_vortex : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_MAGE_SLOW, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_mage_nether_vortex_AuraScript::DoCheck); OnEffectProc += AuraEffectProcFn(spell_mage_nether_vortex_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_nether_vortex_AuraScript(); } @@ -947,7 +947,7 @@ class spell_mage_ring_of_frost : public SpellScriptLoader { PrepareAuraScript(spell_mage_ring_of_frost_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_RING_OF_FROST_SUMMON)) return false; @@ -958,7 +958,7 @@ class spell_mage_ring_of_frost : public SpellScriptLoader return true; } - bool Load() + bool Load() OVERRIDE { ringOfFrost = NULL; return true; @@ -998,14 +998,14 @@ class spell_mage_ring_of_frost : public SpellScriptLoader TempSummon* ringOfFrost; - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mage_ring_of_frost_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectApply += AuraEffectApplyFn(spell_mage_ring_of_frost_AuraScript::Apply, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_ring_of_frost_AuraScript(); } @@ -1022,7 +1022,7 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader { PrepareSpellScript(spell_mage_ring_of_frost_freeze_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_RING_OF_FROST_SUMMON)) return false; @@ -1042,13 +1042,13 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader targets.erase(itr--); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_ring_of_frost_freeze_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mage_ring_of_frost_freeze_SpellScript(); } @@ -1057,7 +1057,7 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader { PrepareAuraScript(spell_mage_ring_of_frost_freeze_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_RING_OF_FROST_DUMMY)) return false; @@ -1071,13 +1071,13 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader GetCaster()->CastSpell(GetTarget(), SPELL_MAGE_RING_OF_FROST_DUMMY, true); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_mage_ring_of_frost_freeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_ring_of_frost_freeze_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 1c7cd395de0..5a5023661d5 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -831,13 +831,13 @@ class spell_pal_sacred_shield : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_pal_sacred_shield_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_sacred_shield_SpellScript(); } @@ -862,7 +862,7 @@ class spell_pal_templar_s_verdict : public SpellScriptLoader return true; } - bool Load() + bool Load() OVERRIDE { if (GetCaster()->GetTypeId() != TYPEID_PLAYER) return false; diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index e47f5d0e811..4e08dd2e431 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -278,7 +278,7 @@ class spell_pri_leap_of_faith_effect_trigger : public SpellScriptLoader { PrepareSpellScript(spell_pri_leap_of_faith_effect_trigger_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_LEAP_OF_FAITH_EFFECT)) return false; @@ -296,13 +296,13 @@ class spell_pri_leap_of_faith_effect_trigger : public SpellScriptLoader GetHitUnit()->CastSpell(targets, sSpellMgr->GetSpellInfo(GetEffectValue()), NULL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pri_leap_of_faith_effect_trigger_SpellScript::HandleEffectDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_leap_of_faith_effect_trigger_SpellScript(); } @@ -668,7 +668,7 @@ class spell_pri_reflective_shield_trigger : public SpellScriptLoader { PrepareAuraScript(spell_pri_reflective_shield_trigger_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_PRIEST_REFLECTIVE_SHIELD_R1)) return false; @@ -689,13 +689,13 @@ class spell_pri_reflective_shield_trigger : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectAbsorb += AuraEffectAbsorbFn(spell_pri_reflective_shield_trigger_AuraScript::Trigger, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_reflective_shield_trigger_AuraScript(); } @@ -793,7 +793,7 @@ class spell_pri_shadowform : public SpellScriptLoader { PrepareAuraScript(spell_pri_shadowform_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_SHADOWFORM_VISUAL_WITHOUT_GLYPH) || !sSpellMgr->GetSpellInfo(SPELL_PRIEST_SHADOWFORM_VISUAL_WITH_GLYPH)) @@ -811,14 +811,14 @@ class spell_pri_shadowform : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(GetTarget()->HasAura(SPELL_PRIEST_GLYPH_OF_SHADOW) ? SPELL_PRIEST_SHADOWFORM_VISUAL_WITH_GLYPH : SPELL_PRIEST_SHADOWFORM_VISUAL_WITHOUT_GLYPH); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_pri_shadowform_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_pri_shadowform_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_shadowform_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index a591209f6c6..d639c84adec 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -423,7 +423,7 @@ class spell_rog_recuperate : public SpellScriptLoader { PrepareAuraScript(spell_rog_recuperate_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -449,14 +449,14 @@ class spell_rog_recuperate : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_recuperate_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_recuperate_AuraScript::CalculateBonus, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_recuperate_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 21304283507..51901dc47c5 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -391,13 +391,13 @@ class spell_sha_feedback : public SpellScriptLoader target->ModifySpellCooldown(SPELL_SHAMAN_ELEMENTAL_MASTERY, aurEff->GetBaseAmount()); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_sha_feedback_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_feedback_AuraScript(); } @@ -497,7 +497,7 @@ class spell_sha_focused_insight : public SpellScriptLoader { PrepareAuraScript(spell_sha_focused_insight_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_FOCUSED_INSIGHT)) return false; @@ -513,13 +513,13 @@ class spell_sha_focused_insight : public SpellScriptLoader GetTarget()->CastCustomSpell(GetTarget(), SPELL_SHAMAN_FOCUSED_INSIGHT, &basePoints0, &basePoints1, &basePoints1, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_sha_focused_insight_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_focused_insight_AuraScript(); } @@ -688,13 +688,13 @@ class spell_sha_lava_surge : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_LAVA_SURGE, true); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_sha_lava_surge_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_lava_surge_AuraScript(); } @@ -709,14 +709,14 @@ class spell_sha_lava_surge_proc : public SpellScriptLoader { PrepareSpellScript(spell_sha_lava_surge_proc_SpellScript) - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LAVA_BURST)) return false; return true; } - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -758,13 +758,13 @@ class spell_sha_mana_tide_totem : public SpellScriptLoader amount = CalculatePct(owner->GetStat(STAT_SPIRIT), aurEff->GetAmount()); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_mana_tide_totem_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_STAT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_mana_tide_totem_AuraScript(); } @@ -825,7 +825,7 @@ class spell_sha_telluric_currents : public SpellScriptLoader return true; } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) OVERRIDE + void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); int32 basePoints0 = CalculatePct(eventInfo.GetDamageInfo()->GetDamage(), aurEff->GetAmount()); @@ -884,7 +884,7 @@ class spell_sha_tidal_waves : public SpellScriptLoader { PrepareAuraScript(spell_sha_tidal_waves_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TIDAL_WAVES)) return false; @@ -900,13 +900,13 @@ class spell_sha_tidal_waves : public SpellScriptLoader GetTarget()->CastCustomSpell(GetTarget(), SPELL_SHAMAN_TIDAL_WAVES, &basePoints0, &basePoints1, NULL, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_sha_tidal_waves_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_tidal_waves_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 5b76f06c195..a18cfb99f31 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -134,7 +134,7 @@ class spell_warl_conflagrate : public SpellScriptLoader { PrepareSpellScript(spell_warl_conflagrate_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_IMMOLATE)) return false; @@ -147,13 +147,13 @@ class spell_warl_conflagrate : public SpellScriptLoader SetHitDamage(CalculatePct(aurEff->GetAmount(), GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster()))); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_conflagrate_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_conflagrate_SpellScript(); } @@ -389,7 +389,7 @@ class spell_warl_demon_soul : public SpellScriptLoader { PrepareSpellScript(spell_warl_demon_soul_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMON_SOUL_IMP)) return false; @@ -434,13 +434,13 @@ class spell_warl_demon_soul : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_demon_soul_SpellScript::OnHitTarget, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_demon_soul_SpellScript; } @@ -565,13 +565,13 @@ class spell_warl_fel_flame : public SpellScriptLoader aura->SetDuration(std::min(newDuration, aura->GetMaxDuration())); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_fel_flame_SpellScript::OnHitTarget, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_fel_flame_SpellScript; } diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index fae038e4c10..ad1decb02a8 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -265,7 +265,7 @@ class spell_warr_execute : public SpellScriptLoader { PrepareSpellScript(spell_warr_execute_SpellScript); - void HandleEffect(SpellEffIndex /*effIndex*/) OVERRIDE + void HandleEffect(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); if (GetHitUnit()) @@ -446,14 +446,14 @@ class spell_warr_rallying_cry : public SpellScriptLoader { PrepareSpellScript(spell_warr_rallying_cry_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_RALLYING_CRY)) return false; return true; } - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -465,13 +465,13 @@ class spell_warr_rallying_cry : public SpellScriptLoader GetCaster()->CastCustomSpell(GetHitUnit(), SPELL_WARRIOR_RALLYING_CRY, &basePoints0, NULL, NULL, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_rallying_cry_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_rallying_cry_SpellScript(); } |