Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 16:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: remove SetEffectDamage helper since SetEffectValue serves the exact same purpose

Browse Source
This commit is contained in:
Ovahlord
2019-02-13 01:31:46 +01:00
parent bdb8b921dd
commit f2503cd7e1
3 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Spells/SpellScript.cpp
View File

@@ -555,16 +555,6 @@ void SpellScript::SetHitDamage(int32 damage)
m_spell->m_damage = damage;
}
void SpellScript::SetEffectDamage(int32 damage)
{
if (!IsInTargetHook())
{
TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::SetHitDamage was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId);
return;
}
m_spell->damage = damage;
}
int32 SpellScript::GetHitHeal() const
{
if (!IsInTargetHook())

1
src/server/game/Spells/SpellScript.h
View File

@@ -427,7 +427,6 @@ class TC_GAME_API SpellScript : public _SpellScript
int32 GetHitDamage() const;
void SetHitDamage(int32 damage);
void PreventHitDamage() { SetHitDamage(0); }
void SetEffectDamage(int32 damage);
// setter/getter for for heal done by spell to target of spell hit
// returns healing calculated before hit, and real dmg done after hit
int32 GetHitHeal() const;

2
src/server/scripts/Spells/spell_warrior.cpp
View File

@@ -963,7 +963,7 @@ class spell_warr_victory_rush : public SpellScript
if (Player* modOwner = caster->GetSpellModOwner())
modOwner->ApplySpellMod(m_scriptSpellId, SPELLMOD_EFFECT3, damage);
SetEffectDamage(damage);
SetEffectValue(damage);
}
caster->RemoveAurasDueToSpell(SPELL_WARRIOR_VICTORIOUS);