*Update some spell attr flag. Use better way to check IsRangedSpell and UnaffectedByInvulnerability

--HG-- branch : trunk
2009-05-08 00:49:02 -05:00
parent e8474f3291
commit 979073cebd
9 changed files with 57 additions and 73 deletions
@@ -447,11 +447,7 @@ class Spell
        void ReSetTimer() { m_timer = m_casttime > 0 ? m_casttime : 0; }
        bool IsNextMeleeSwingSpell() const
        {
-            return m_spellInfo->Attributes & (SPELL_ATTR_ON_NEXT_SWING_1|SPELL_ATTR_ON_NEXT_SWING_2);
-        }
-        bool IsRangedSpell() const
-        {
-            return  m_spellInfo->Attributes & SPELL_ATTR_RANGED;
+            return m_spellInfo->Attributes & SPELL_ATTR_ON_NEXT_SWING;
        }
        bool IsChannelActive() const { return m_caster->GetUInt32Value(UNIT_CHANNEL_SPELL) != 0; }
        bool IsMeleeAttackResetSpell() const { return !m_IsTriggeredSpell && (m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_AUTOATTACK);  }