From c79e5528e1a2b42fae2744ddb39efe91dd8c865a Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 16 May 2021 20:32:51 +0200 Subject: Core/Units: Remove Unit::EnergizeBySpell overload taking spellId argument --- src/server/game/Entities/Unit/Unit.cpp | 6 ------ src/server/game/Entities/Unit/Unit.h | 1 - src/server/scripts/Spells/spell_generic.cpp | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 95d007aa834..358787d511c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6687,12 +6687,6 @@ void Unit::SendEnergizeSpellLog(Unit* victim, uint32 spellID, int32 damage, int3 SendCombatLogMessage(&data); } -void Unit::EnergizeBySpell(Unit* victim, uint32 spellId, int32 damage, Powers powerType) -{ - if (SpellInfo const* info = sSpellMgr->GetSpellInfo(spellId, GetMap()->GetDifficultyID())) - EnergizeBySpell(victim, info, damage, powerType); -} - void Unit::EnergizeBySpell(Unit* victim, SpellInfo const* spellInfo, int32 damage, Powers powerType) { int32 gain = victim->ModifyPower(powerType, damage, false); diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 7f5f57a621f..d4305d044f0 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1168,7 +1168,6 @@ class TC_GAME_API Unit : public WorldObject void SendHealSpellLog(HealInfo& healInfo, bool critical = false); int32 HealBySpell(HealInfo& healInfo, bool critical = false); void SendEnergizeSpellLog(Unit* victim, uint32 spellId, int32 damage, int32 overEnergize, Powers powerType); - void EnergizeBySpell(Unit* victim, uint32 spellId, int32 damage, Powers powerType); void EnergizeBySpell(Unit* victim, SpellInfo const* spellInfo, int32 damage, Powers powerType); // CastSpell's third arg can be a variety of things - check out CastSpellExtraArgs' constructors! diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index eeed540a725..01fa16c6772 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -2380,7 +2380,7 @@ class spell_gen_restoration : public AuraScript if (int32 mana = caster->GetMaxPower(POWER_MANA)) { mana /= 10; - caster->EnergizeBySpell(caster, GetId(), mana, POWER_MANA); + caster->EnergizeBySpell(caster, GetSpellInfo(), mana, POWER_MANA); } } -- cgit v1.2.3