diff options
| author | QAston <none@none> | 2009-04-20 12:38:35 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-04-20 12:38:35 +0200 |
| commit | 9ddd7cf660fc73f2a3963a0f88c16f7d1d823a41 (patch) | |
| tree | 5ac69cb495fcd68c21d2ac7d1bc809715529356b /src/game/Spell.cpp | |
| parent | 8ad26e0db6cd9550373b9b81902e03c232eb9f4d (diff) | |
Implement attribute flag SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER, fix improved fire nova totem.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index a461d49a554..70d152b9e5b 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -908,7 +908,8 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) // Fill base trigger info uint32 procAttacker = m_procAttacker; uint32 procVictim = m_procVictim; - uint32 procEx = m_triggeredByAuraSpell? PROC_EX_INTERNAL_TRIGGERED : PROC_EX_NONE; + 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 |