diff options
| author | QAston <none@none> | 2009-04-20 14:23:00 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-04-20 14:23:00 +0200 |
| commit | 4ac0914d81ebad67b63e3b093117cc67cb717d81 (patch) | |
| tree | ec723d8a1a3151f7cb51bb060025c143556f0ab7 /src/game/Spell.cpp | |
| parent | 9ddd7cf660fc73f2a3963a0f88c16f7d1d823a41 (diff) | |
*Change totem cast handling, use owner guid as m_originalCaster by default.
*Check range for formal caster instead of original one
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 70d152b9e5b..723dca962bd 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -909,7 +909,6 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) uint32 procAttacker = m_procAttacker; uint32 procVictim = m_procVictim; uint32 procEx = m_triggeredByAuraSpell && !(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER) ? PROC_EX_INTERNAL_TRIGGERED : PROC_EX_NONE; - sLog.outError("%d, %d, %d",m_procAttacker, m_procVictim, procEx); m_spellAura = NULL; // Set aura to null for every target-make sure that pointer is not used for unit without aura applied if (missInfo==SPELL_MISS_NONE) // In case spell hit target, do all effect on that target @@ -1515,14 +1514,11 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap) unMaxTargets+=(*j)->GetAmount(); } - if(m_originalCaster) + if(Player* modOwner = m_caster->GetSpellModOwner()) { - if(Player* modOwner = m_originalCaster->GetSpellModOwner()) - { - modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius_f,this); - modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius_h,this); - modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_JUMP_TARGETS, EffectChainTarget, this); - } + modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius_f,this); + modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius_h,this); + modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_JUMP_TARGETS, EffectChainTarget, this); } if(EffectChainTarget > 1) |