diff options
| author | megamage <none@none> | 2009-07-24 09:59:33 +0800 |
|---|---|---|
| committer | megamage <none@none> | 2009-07-24 09:59:33 +0800 |
| commit | b6c0f72b1350b76da6add2781ff54e343eaf2c48 (patch) | |
| tree | 5c1cdca52f872f42e54513ffbdd40041a017abe3 /src/game/SpellAuras.cpp | |
| parent | f9d0ccf8574e9b40fdeac17473b224cacbb1d457 (diff) | |
*Do not let Incinerate has extra damage for Shadowflame Author: rechapa79
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellAuras.cpp')
| -rw-r--r-- | src/game/SpellAuras.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index e027632328d..5f9a3d6eeae 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -1203,10 +1203,13 @@ void Aura::_AddAura() if (IsSealSpell(m_spellProto)) SetAuraState(AURA_STATE_JUDGEMENT); - // Conflagrate aura state on Immolate or Shadowflame - if (m_spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && (m_spellProto->SpellFamilyFlags[0] & 4 - || m_spellProto->SpellFamilyFlags[2] & 2)) - SetAuraState(AURA_STATE_IMMOLATE); + // Conflagrate aura state on Immolate and Shadowflame + if (m_spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && + // Immolate + ((m_spellProto->SpellFamilyFlags[0] & 4) || + // Shadowflame + (m_spellProto->SpellFamilyFlags[2] & 2))) + SetAuraState(AURA_STATE_CONFLAGRATE); // Faerie Fire (druid versions) if (m_spellProto->SpellFamilyName == SPELLFAMILY_DRUID && m_spellProto->SpellFamilyFlags[0] & 0x400) |