Changeset 213 for trunk/src/game/Spell.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/Spell.cpp (modified) (3 diffs)

trunk/src/game/Spell.cpp

@@ -957 +957 @@
                 unit->SetStandState(PLAYER_STATE_NONE);
 
-            if(!unit->isInCombat() && unit->GetTypeId() != TYPEID_PLAYER && ((Creature*)unit)->AI())
-                ((Creature*)unit)->AI()->AttackStart(m_caster);
-
-            unit->SetInCombatWith(m_caster);
-            m_caster->SetInCombatWith(unit);
-
-            if(Player *attackedPlayer = unit->GetCharmerOrOwnerPlayerOrPlayerItself())
-                m_caster->SetContestedPvP(attackedPlayer);
+            m_caster->CombatStart(unit);
         }
     }
@@ -1003 +996 @@
             }
 
-            //if(!IsPositiveSpell(m_spellInfo->Id))
-            {
-                //do not remove feign death
-                unit->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_STEALTH + AURA_INTERRUPT_FLAG_DAMAGE);
-            }
+            unit->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_HITBYSPELL);
         }
         else
@@ -2248 +2237 @@
     if ( !m_IsTriggeredSpell && isSpellBreakStealth(m_spellInfo) )
     {
-        m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_STEALTH);
+        m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CAST);
     }