From ed8b9fe1c49be6e649735d6f3ec901e2360f2faa Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 25 Jul 2016 15:49:08 +0200 Subject: [PATCH] Scripts/Misc: Add missing override --- src/server/scripts/Spells/spell_mage.cpp | 24 ++++++++++----------- src/server/scripts/Spells/spell_paladin.cpp | 6 +++--- src/server/scripts/Spells/spell_priest.cpp | 6 +++--- src/server/scripts/Spells/spell_rogue.cpp | 20 ++++++++--------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index d05eee1ba47..b7bb7a2cbe5 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -283,7 +283,7 @@ class spell_mage_blizzard : public SpellScriptLoader { PrepareSpellScript(spell_mage_blizzard_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_CHILLED_R1)) return false; @@ -304,13 +304,13 @@ class spell_mage_blizzard : public SpellScriptLoader } } - void Register() + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_mage_blizzard_SpellScript::AddChillEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const override { return new spell_mage_blizzard_SpellScript(); } @@ -733,7 +733,7 @@ class spell_mage_living_bomb : public SpellScriptLoader { PrepareAuraScript(spell_mage_living_bomb_AuraScript); - bool Validate(SpellInfo const* spellInfo) + bool Validate(SpellInfo const* spellInfo) override { if (!sSpellMgr->GetSpellInfo(uint32(spellInfo->Effects[EFFECT_1].CalcValue()))) return false; @@ -791,7 +791,7 @@ class spell_mage_ice_barrier : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_MAGE_SHATTERED_BARRIER_FREEZE_R2, true); } - void Register() + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_ice_barrier_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); AfterEffectRemove += AuraEffectRemoveFn(spell_mage_ice_barrier_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); @@ -1109,7 +1109,7 @@ class spell_mage_polymorph : public SpellScriptLoader } private: - Unit* _caster; + Unit* _caster = nullptr; }; AuraScript* GetAuraScript() const override @@ -1186,7 +1186,7 @@ class spell_mage_replenish_mana : public SpellScriptLoader { PrepareSpellScript(spell_mage_replenish_mana_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_IMPROVED_MANA_GEM_TRIGGERED)) return false; @@ -1202,13 +1202,13 @@ class spell_mage_replenish_mana : public SpellScriptLoader } } - void Register() + void Register() override { AfterCast += SpellCastFn(spell_mage_replenish_mana_SpellScript::HandleImprovedManaGem); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const override { return new spell_mage_replenish_mana_SpellScript(); } @@ -1419,7 +1419,7 @@ class spell_mage_water_elemental_freeze : public SpellScriptLoader { PrepareSpellScript(spell_mage_water_elemental_freeze_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FINGERS_OF_FROST)) return false; @@ -1447,7 +1447,7 @@ class spell_mage_water_elemental_freeze : public SpellScriptLoader } } - void Register() + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_water_elemental_freeze_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); AfterCast += SpellCastFn(spell_mage_water_elemental_freeze_SpellScript::HandleImprovedFreeze); @@ -1457,7 +1457,7 @@ class spell_mage_water_elemental_freeze : public SpellScriptLoader bool _didHit; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const override { return new spell_mage_water_elemental_freeze_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 0752cb4675d..f70b0992db4 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -1119,7 +1119,7 @@ class spell_pal_shield_of_the_righteous : public SpellScriptLoader { PrepareSpellScript(spell_pal_shield_of_the_righteous_SpellScript); - bool Load() + bool Load() override { if (GetCaster()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1145,13 +1145,13 @@ class spell_pal_shield_of_the_righteous : public SpellScriptLoader SetHitDamage(damage); } - void Register() + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_pal_shield_of_the_righteous_SpellScript::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const override { return new spell_pal_shield_of_the_righteous_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 7d77eaa5a2d..d801346bc00 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -213,7 +213,7 @@ public: { PrepareSpellScript(spell_pri_dispel_magic_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_ABSOLUTION)) return false; @@ -249,14 +249,14 @@ public: GetCaster()->CastSpell(GetHitUnit(), SPELL_PRIEST_DISPEL_MAGIC_HOSTILE, true); } - void Register() + void Register() override { OnCheckCast += SpellCheckCastFn(spell_pri_dispel_magic_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_pri_dispel_magic_SpellScript::AfterEffectHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const override { return new spell_pri_dispel_magic_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index a73abbcdee5..6f36e4a1a25 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -466,7 +466,7 @@ class spell_rog_master_of_subtlety : public SpellScriptLoader { PrepareAuraScript(spell_rog_master_of_subtlety_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_MASTER_OF_SUBTLETY_DAMAGE_PERCENT)) return false; @@ -481,13 +481,13 @@ class spell_rog_master_of_subtlety : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_ROGUE_MASTER_OF_SUBTLETY_DAMAGE_PERCENT); } - void Register() + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_master_of_subtlety_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const override { return new spell_rog_master_of_subtlety_AuraScript(); } @@ -554,7 +554,7 @@ class spell_rog_overkill : public SpellScriptLoader { PrepareAuraScript(spell_rog_overkill_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_OVERKILL_POWER_REGEN)) return false; @@ -569,13 +569,13 @@ class spell_rog_overkill : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_ROGUE_OVERKILL_POWER_REGEN); } - void Register() + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_overkill_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const override { return new spell_rog_overkill_AuraScript(); } @@ -829,7 +829,7 @@ class spell_rog_stealth : public SpellScriptLoader { PrepareAuraScript(spell_rog_stealth_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_MASTER_OF_SUBTLETY_PASSIVE) || !sSpellMgr->GetSpellInfo(SPELL_ROGUE_MASTER_OF_SUBTLETY_DAMAGE_PERCENT) || @@ -870,14 +870,14 @@ class spell_rog_stealth : public SpellScriptLoader target->CastSpell(target, SPELL_ROGUE_OVERKILL_PERIODIC, true); } - void Register() + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_rog_stealth_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_rog_stealth_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_rog_stealth_AuraScript(); } @@ -997,7 +997,7 @@ public: } } - void Register() + void Register() override { OnHit += SpellHitFn(spell_rog_serrated_blades_SpellScript::HandleHit); }