Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Misc: Remove obsolete C++11 backward compatibility macros

Browse Source 
OVERRIDE, FINAL, DELETE_MEMBER
This commit is contained in:
Dehravor committed 2014-04-29 16:35:11 +02:00
1 parent 414554aefa
commit 24ae6a6802
639 files changed
+9594 -9604
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/Spells/spell_warlock.cpp
+51 -51
View File
@@ -71,7 +71,7 @@ class spell_warl_banish : public SpellScriptLoader
{
PrepareSpellScript(spell_warl_banish_SpellScript);
bool Load() OVERRIDE
bool Load() override
{
_removed = false;
return true;
@@ -98,7 +98,7 @@ class spell_warl_banish : public SpellScriptLoader
PreventHitAura();
}
void Register() OVERRIDE
void Register() override
{
BeforeHit += SpellHitFn(spell_warl_banish_SpellScript::HandleBanish);
AfterHit += SpellHitFn(spell_warl_banish_SpellScript::RemoveAura);
@@ -107,7 +107,7 @@ class spell_warl_banish : public SpellScriptLoader
bool _removed;
};
SpellScript* GetSpellScript() const OVERRIDE
SpellScript* GetSpellScript() const override
{
return new spell_warl_banish_SpellScript();
}
@@ -125,7 +125,7 @@ class spell_warl_create_healthstone : public SpellScriptLoader
static uint32 const iTypes[8][3];
bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_IMPROVED_HEALTHSTONE_R1) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_IMPROVED_HEALTHSTONE_R2))
return false;
@@ -172,14 +172,14 @@ class spell_warl_create_healthstone : public SpellScriptLoader
}
}
void Register() OVERRIDE
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_create_healthstone_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnCheckCast += SpellCheckCastFn(spell_warl_create_healthstone_SpellScript::CheckCast);
}
};
SpellScript* GetSpellScript() const OVERRIDE
SpellScript* GetSpellScript() const override
{
return new spell_warl_create_healthstone_SpellScript();
}
@@ -206,14 +206,14 @@ class spell_warl_curse_of_doom : public SpellScriptLoader
{
PrepareAuraScript(spell_warl_curse_of_doom_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_CURSE_OF_DOOM_EFFECT))
return false;
return true;
}
bool Load() OVERRIDE
bool Load() override
{
return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER;
}
@@ -231,13 +231,13 @@ class spell_warl_curse_of_doom : public SpellScriptLoader
GetCaster()->CastSpell(GetTarget(), SPELL_WARLOCK_CURSE_OF_DOOM_EFFECT, true, NULL, aurEff);
}
void Register() OVERRIDE
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_warl_curse_of_doom_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const OVERRIDE
AuraScript* GetAuraScript() const override
{
return new spell_warl_curse_of_doom_AuraScript();
}
@@ -282,14 +282,14 @@ class spell_warl_demonic_circle_summon : public SpellScriptLoader
}
}
void Register() OVERRIDE
void Register() override
{
OnEffectRemove += AuraEffectApplyFn(spell_warl_demonic_circle_summon_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_demonic_circle_summon_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const OVERRIDE
AuraScript* GetAuraScript() const override
{
return new spell_warl_demonic_circle_summon_AuraScript();
}
@@ -317,13 +317,13 @@ class spell_warl_demonic_circle_teleport : public SpellScriptLoader
}
}
void Register() OVERRIDE
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_warl_demonic_circle_teleport_AuraScript::HandleTeleport, EFFECT_0, SPELL_AURA_MECHANIC_IMMUNITY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const OVERRIDE
AuraScript* GetAuraScript() const override
{
return new spell_warl_demonic_circle_teleport_AuraScript();
}
@@ -339,7 +339,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader
{
PrepareSpellScript(spell_warl_demonic_empowerment_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_SUCCUBUS) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_VOIDWALKER) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_FELGUARD) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_FELHUNTER) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_IMP))
return false;
@@ -381,13 +381,13 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader
}
}
void Register() OVERRIDE
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_demonic_empowerment_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const OVERRIDE
SpellScript* GetSpellScript() const override
{
return new spell_warl_demonic_empowerment_SpellScript();
}
@@ -411,13 +411,13 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader
aur->GetBase()->RefreshDuration();
}
void Register() OVERRIDE
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_everlasting_affliction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const OVERRIDE
SpellScript* GetSpellScript() const override
{
return new spell_warl_everlasting_affliction_SpellScript();
}
@@ -433,7 +433,7 @@ class spell_warl_fel_synergy : public SpellScriptLoader
{
PrepareAuraScript(spell_warl_fel_synergy_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_FEL_SYNERGY_HEAL))
return false;
@@ -453,14 +453,14 @@ class spell_warl_fel_synergy : public SpellScriptLoader
GetTarget()->CastCustomSpell(SPELL_WARLOCK_FEL_SYNERGY_HEAL, SPELLVALUE_BASE_POINT0, heal, (Unit*)NULL, true, NULL, aurEff); // TARGET_UNIT_PET
}
void Register() OVERRIDE
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warl_fel_synergy_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warl_fel_synergy_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const OVERRIDE
AuraScript* GetAuraScript() const override
{
return new spell_warl_fel_synergy_AuraScript();
}
@@ -476,7 +476,7 @@ class spell_warl_glyph_of_shadowflame : public SpellScriptLoader
{
PrepareAuraScript(spell_warl_glyph_of_shadowflame_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_GLYPH_OF_SHADOWFLAME))
return false;
@@ -489,13 +489,13 @@ class spell_warl_glyph_of_shadowflame : public SpellScriptLoader
GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_WARLOCK_GLYPH_OF_SHADOWFLAME, true, NULL, aurEff);
}
void Register() OVERRIDE
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warl_glyph_of_shadowflame_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const OVERRIDE
AuraScript* GetAuraScript() const override
{
return new spell_warl_glyph_of_shadowflame_AuraScript();
}
@@ -518,7 +518,7 @@ class spell_warl_haunt : public SpellScriptLoader
aurEff->SetAmount(CalculatePct(aurEff->GetAmount(), GetHitDamage()));
}
void Register() OVERRIDE
void Register() override
{
OnHit += SpellHitFn(spell_warl_haunt_SpellScript::HandleOnHit);
}
@@ -528,7 +528,7 @@ class spell_warl_haunt : public SpellScriptLoader
{
PrepareAuraScript(spell_warl_haunt_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_HAUNT_HEAL))
return false;
@@ -544,18 +544,18 @@ class spell_warl_haunt : public SpellScriptLoader
}
}
void Register() OVERRIDE
void Register() override
{
OnEffectRemove += AuraEffectApplyFn(spell_warl_haunt_AuraScript::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
SpellScript* GetSpellScript() const OVERRIDE
SpellScript* GetSpellScript() const override
{
return new spell_warl_haunt_SpellScript();
}
AuraScript* GetAuraScript() const OVERRIDE
AuraScript* GetAuraScript() const override
{
return new spell_warl_haunt_AuraScript();
}
@@ -591,14 +591,14 @@ class spell_warl_health_funnel : public SpellScriptLoader
target->RemoveAurasDueToSpell(SPELL_WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R2);
}
void Register() OVERRIDE
void Register() override
{
OnEffectRemove += AuraEffectRemoveFn(spell_warl_health_funnel_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
OnEffectApply += AuraEffectApplyFn(spell_warl_health_funnel_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const OVERRIDE
AuraScript* GetAuraScript() const override
{
return new spell_warl_health_funnel_AuraScript();
}
@@ -614,12 +614,12 @@ class spell_warl_life_tap : public SpellScriptLoader
{
PrepareSpellScript(spell_warl_life_tap_SpellScript);
bool Load() OVERRIDE
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
}
bool Validate(SpellInfo const* /*spell*/) OVERRIDE
bool Validate(SpellInfo const* /*spell*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE_2))
return false;
@@ -663,14 +663,14 @@ class spell_warl_life_tap : public SpellScriptLoader
return SPELL_FAILED_FIZZLE;
}
void Register() OVERRIDE
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_life_tap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnCheckCast += SpellCheckCastFn(spell_warl_life_tap_SpellScript::CheckCast);
}
};
SpellScript* GetSpellScript() const OVERRIDE
SpellScript* GetSpellScript() const override
{
return new spell_warl_life_tap_SpellScript();
}
@@ -692,13 +692,13 @@ class spell_warl_ritual_of_doom_effect : public SpellScriptLoader
caster->CastSpell(caster, GetEffectValue(), true);
}
void Register() OVERRIDE
void Register() override
{
OnEffectHit += SpellEffectFn(spell_warl_ritual_of_doom_effect_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const OVERRIDE
SpellScript* GetSpellScript() const override
{
return new spell_warl_ritual_of_doom_effect_SpellScript();
}
@@ -720,13 +720,13 @@ class spell_warl_seed_of_corruption : public SpellScriptLoader
targets.remove(GetExplTargetUnit());
}
void Register() OVERRIDE
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warl_seed_of_corruption_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
}
};
SpellScript* GetSpellScript() const OVERRIDE
SpellScript* GetSpellScript() const override
{
return new spell_warl_seed_of_corruption_SpellScript();
}
@@ -757,13 +757,13 @@ class spell_warl_shadow_ward : public SpellScriptLoader
}
}
void Register() OVERRIDE
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_shadow_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
}
};
AuraScript* GetAuraScript() const OVERRIDE
AuraScript* GetAuraScript() const override
{
return new spell_warl_shadow_ward_AuraScript();
}
@@ -779,7 +779,7 @@ class spell_warl_siphon_life : public SpellScriptLoader
{
PrepareAuraScript(spell_warl_siphon_life_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SIPHON_LIFE_HEAL))
return false;
@@ -805,14 +805,14 @@ class spell_warl_siphon_life : public SpellScriptLoader
GetTarget()->CastCustomSpell(SPELL_WARLOCK_SIPHON_LIFE_HEAL, SPELLVALUE_BASE_POINT0, amount, GetTarget(), true, NULL, aurEff);
}
void Register() OVERRIDE
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warl_siphon_life_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warl_siphon_life_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const OVERRIDE
AuraScript* GetAuraScript() const override
{
return new spell_warl_siphon_life_AuraScript();
}
@@ -828,7 +828,7 @@ class spell_warl_soulshatter : public SpellScriptLoader
{
PrepareSpellScript(spell_warl_soulshatter_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOULSHATTER))
return false;
@@ -845,13 +845,13 @@ class spell_warl_soulshatter : public SpellScriptLoader
}
}
void Register() OVERRIDE
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_soulshatter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const OVERRIDE
SpellScript* GetSpellScript() const override
{
return new spell_warl_soulshatter_SpellScript();
}
@@ -867,7 +867,7 @@ class spell_warl_unstable_affliction : public SpellScriptLoader
{
PrepareAuraScript(spell_warl_unstable_affliction_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL))
return false;
@@ -885,13 +885,13 @@ class spell_warl_unstable_affliction : public SpellScriptLoader
}
}
void Register() OVERRIDE
void Register() override
{
AfterDispel += AuraDispelFn(spell_warl_unstable_affliction_AuraScript::HandleDispel);
}
};
AuraScript* GetAuraScript() const OVERRIDE
AuraScript* GetAuraScript() const override
{
return new spell_warl_unstable_affliction_AuraScript();
}