From 2d820e591b7f631957217cc74e7b4f3700b4f7f0 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 21 Dec 2024 22:01:54 +0100 Subject: Scripts/Spells: moved warrior spell scripts into namespaces to respect the one definition rule --- src/server/scripts/Spells/spell_warrior.cpp | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'src/server/scripts/Spells') diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 0b1e7ecda21..7469026049f 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -25,22 +25,26 @@ #include "SpellScript.h" #include "Unit.h" -// 78 - Heroic Strike -class spell_warr_heroic_strike : public SpellScript +namespace Scripts::Spells::Warrior { - // Damage = {8+$ap*60/100} - void CalculateDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit* /*victim*/, int32& damage, int32& /*flatMod*/, float& /*pctMod*/) + // 78 - Heroic Strike + class spell_warr_heroic_strike : public SpellScript { - damage = static_cast(8 + GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK) * 0.6f); - } + // Damage = {8+$ap*60/100} + void CalculateDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit* /*victim*/, int32& damage, int32& /*flatMod*/, float& /*pctMod*/) + { + damage = static_cast(8 + GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK) * 0.6f); + } - void Register() override - { - CalcDamage += SpellCalcDamageFn(spell_warr_heroic_strike::CalculateDamage); - } -}; + void Register() override + { + CalcDamage += SpellCalcDamageFn(spell_warr_heroic_strike::CalculateDamage); + } + }; +} void AddSC_warrior_spell_scripts() { + using namespace Scripts::Spells::Warrior; RegisterSpellScript(spell_warr_heroic_strike); } -- cgit v1.2.3