From 64caf2cdf2973d34b770a9216a58a4d2d01a0676 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 9 Apr 2011 19:57:32 +0200 Subject: Core/Spells: Add default handler for apply aura spell effect when both ImplicitTargets are 0, removed unused structure --- src/server/game/Spells/Spell.cpp | 4 ++-- src/server/game/Spells/Spell.h | 2 +- src/server/game/Spells/SpellMgr.h | 7 ------- 3 files changed, 3 insertions(+), 10 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 1bfcb00bf31..7217a492e62 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -755,6 +755,8 @@ void Spell::SelectSpellTargets() AddUnitTarget(m_caster, i); break; default: // apply to target in other case + if (m_targets.getUnitTarget()) + AddUnitTarget(m_targets.getUnitTarget(), i); break; } break; @@ -765,9 +767,7 @@ void Spell::SelectSpellTargets() break; case SPELL_EFFECT_SKIN_PLAYER_CORPSE: if (m_targets.getUnitTarget()) - { AddUnitTarget(m_targets.getUnitTarget(), i); - } else if (m_targets.getCorpseTargetGUID()) { Corpse *corpse = ObjectAccessor::GetCorpse(*m_caster,m_targets.getCorpseTargetGUID()); diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 85428beb57d..8bcbf656474 100755 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -757,7 +757,7 @@ namespace Trinity ASSERT(i_source); } - template inline void Visit(GridRefManager &m) + template inline void Visit(GridRefManager& m) { i_requireDeadTarget = i_spellProto ? bool(i_spellProto->AttributesEx3 & SPELL_ATTR3_REQUIRE_DEAD_TARGET) : false; diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 596223866eb..247ee3d2b81 100755 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -709,13 +709,6 @@ enum SpellScriptTargetType #define MAX_SPELL_TARGET_TYPE 4 -struct SpellTargetEntry -{ - SpellTargetEntry(SpellScriptTargetType type_,uint32 targetEntry_) : type(type_), targetEntry(targetEntry_) {} - SpellScriptTargetType type; - uint32 targetEntry; -}; - // coordinates for spells (accessed using SpellMgr functions) struct SpellTargetPosition { -- cgit v1.2.3