Changeset 213 for trunk/src/game/Player.cpp

Timestamp:

11/19/08 13:47:00 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix some aura_interrupt_flag to correctly remove auras.
Add interrupt_flag_unattackable. Source: mangos forum. Adapted by F636y623.
Add function CombatStart?().

Original author: megamage
Date: 2008-11-11 17:49:51-06:00

Files:

• trunk/src/game/Player.cpp (modified) (3 diffs)

trunk/src/game/Player.cpp

@@ -16606 +16606 @@
 
     // prevent stealth flight
-    RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_STEALTH);
+    RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LOOT);
 
     WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
@@ -18886 +18886 @@
     return ( //InBattleGround() &&                            // in battleground - not need, check in other cases
              !IsMounted() &&                                  // not mounted
+             !isTotalImmunity() &&                              // not totally immuned
              !HasStealthAura() &&                             // not stealthed
              !HasInvisibilityAura() &&                        // not invisible
@@ -18901 +18902 @@
     return false;
 }
+
+bool Player::isTotalImmunity()
+{
+    AuraList const& immune = GetAurasByType(SPELL_AURA_SCHOOL_IMMUNITY);
+
+    for(AuraList::const_iterator itr = immune.begin(); itr != immune.end(); ++itr)
+    {
+        if (((*itr)->GetModifier()->m_miscvalue & SPELL_SCHOOL_MASK_ALL) !=0)   // total immunity
+        {
+            return true;
+        }
+        if (((*itr)->GetModifier()->m_miscvalue & SPELL_SCHOOL_MASK_NORMAL) !=0)   // physical damage immunity
+        {
+            for(AuraList::const_iterator i = immune.begin(); i != immune.end(); ++i)
+            {
+                if (((*i)->GetModifier()->m_miscvalue & SPELL_SCHOOL_MASK_MAGIC) !=0)   // magic immunity
+                {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}