diff options
| author | QAston <none@none> | 2009-03-15 23:59:06 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2009-03-15 23:59:06 +0100 |
| commit | 5bc3df176a50bc0eaa5c8f02e57229fd882b39fd (patch) | |
| tree | 40708404528627727a80e2846f686de48df3fe2f /src/game/Spell.cpp | |
| parent | 61f519ca26f6d75e2096b5469691a0f37d53bbed (diff) | |
*Fix Living Bomb target selection.
*Fix healing mod apply for devouring plague.
*Fix psychic horror.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index bfc58631079..91c4a536d56 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1380,6 +1380,9 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin void Spell::SearchAreaTarget(std::list<Unit*> &TagUnitMap, float radius, const uint32 &type, SpellTargets TargetType, uint32 entry) { float x, y, z; + + Unit *target = m_targets.getUnitTarget(); + if(type == PUSH_DEST_CENTER) { if(!m_targets.HasDest()) @@ -1393,7 +1396,6 @@ void Spell::SearchAreaTarget(std::list<Unit*> &TagUnitMap, float radius, const u } else if(type == PUSH_TARGET_CENTER) { - Unit *target = m_targets.getUnitTarget(); if(!target) { sLog.outError( "SPELL: cannot find unit target for spell ID %u\n", m_spellInfo->Id ); @@ -1410,7 +1412,7 @@ void Spell::SearchAreaTarget(std::list<Unit*> &TagUnitMap, float radius, const u z = m_caster->GetPositionZ(); } - Trinity::SpellNotifierCreatureAndPlayer notifier(*this, TagUnitMap, radius, type, TargetType, entry, x, y, z); + Trinity::SpellNotifierCreatureAndPlayer notifier(*this, TagUnitMap, radius, type, TargetType, entry, x, y, z, target); if((m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_PLAYERS_ONLY) || TargetType == SPELL_TARGETS_ENTRY && !entry) m_caster->GetMap()->VisitWorld(x, y, radius, notifier); |