diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-12-21 00:40:08 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-12-21 17:41:47 +0100 |
| commit | cb29e42e3a2d7e7bf7d6008881129f6052fb184e (patch) | |
| tree | 4e52626b622d178368e26456d3f50906f279d401 /src/server/scripts/Northrend | |
| parent | 4011a0df2b9c79eec570aebb17e14187cda37af5 (diff) | |
Core/Scripts: Added SpellEffectInfo argument to CalcDamage and CalcHealing spell script hooks
(cherry picked from commit 884662a75a901af6f61cab9efc171d052e8042f4)
# Conflicts:
# src/server/scripts/Shadowlands/Torghast/spell_torghast.cpp
# src/server/scripts/Spells/spell_azerite.cpp
# src/server/scripts/Spells/spell_evoker.cpp
# src/server/scripts/Spells/spell_priest.cpp
# src/server/scripts/Spells/spell_rogue.cpp
# src/server/scripts/Spells/spell_warlock.cpp
Diffstat (limited to 'src/server/scripts/Northrend')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 8a0d8b761e8..a5db42cf2d3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -240,7 +240,7 @@ private: // 68793, 69050 - Magic's Bane class spell_bronjahm_magic_bane : public SpellScript { - void CalculateDamage(Unit const* victim, int32& damage, int32& /*flatMod*/, float& /*pctMod*/) const + void CalculateDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit const* victim, int32& damage, int32& /*flatMod*/, float& /*pctMod*/) const { if (victim->GetPowerType() != POWER_MANA) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index de35763ca12..ccbed6d6e31 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -1282,7 +1282,7 @@ class spell_blood_council_shadow_prison : public AuraScript // 72999 - Shadow Prison class spell_blood_council_shadow_prison_damage : public SpellScript { - void CalculateDamage(Unit const* victim, int32& /*damage*/, int32& flatMod, float& /*pctMod*/) const + void CalculateDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit const* victim, int32& /*damage*/, int32& flatMod, float& /*pctMod*/) const { if (Aura const* aur = victim->GetAura(GetSpellInfo()->Id)) if (AuraEffect const* eff = aur->GetEffect(EFFECT_1)) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 98580bde1cb..511548b276b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -1888,7 +1888,7 @@ class spell_igb_incinerating_blast : public SpellScript GetCaster()->SetPower(POWER_ENERGY, 0); } - void CalculateDamage(Unit const* /*victim*/, int32& /*damage*/, int32& flatMod, float& /*pctMod*/) const + void CalculateDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit const* /*victim*/, int32& /*damage*/, int32& flatMod, float& /*pctMod*/) const { flatMod += _energyLeft * _energyLeft * 8; } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 3374e1776b6..a39b6aa6418 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -438,7 +438,7 @@ class spell_oculus_shock_lance : public SpellScript return ValidateSpellInfo({ SPELL_AMBER_SHOCK_CHARGE }); } - void CalculateDamage(Unit const* victim, int32& /*damage*/, int32& flatMod, float& /*pctMod*/) const + void CalculateDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit const* victim, int32& /*damage*/, int32& flatMod, float& /*pctMod*/) const { if (AuraEffect const* shockCharges = victim->GetAuraEffect(SPELL_AMBER_SHOCK_CHARGE, EFFECT_0, GetCaster()->GetGUID())) { |