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

trunk/src/game/Unit.cpp

@@ -473 +473 @@
 
         //sLog.outDetail("auraflag:%u flag:%u = %u",(*iter)->GetSpellProto()->AuraInterruptFlags,flag,(*iter)->GetSpellProto()->AuraInterruptFlags & flag);
-        if(*iter && ((*iter)->GetSpellProto()->AuraInterruptFlags & flag) == flag)
+        if(*iter && ((*iter)->GetSpellProto()->AuraInterruptFlags & flag))
         {
             RemoveAurasDueToSpell((*iter)->GetId());
@@ -489 +489 @@
 }
 
+/* Called by DealDamage for auras that have a chance to be dispelled on damage taken. */
+void Unit::RemoveSpellbyDamageTaken(uint32 damage, uint32 spell)
+{
+    // The chance to dispel an aura depends on the damage taken with respect to the casters level.
+    uint32 max_dmg = getLevel() > 8 ? 25 * getLevel() - 150 : 50;
+    float chance = float(damage) / max_dmg * 100.0f;
+
+    AuraList::iterator i, next;
+    for(i = m_ccAuras.begin(); i != m_ccAuras.end(); i = next)
+    {
+        next = i;
+        ++next;
+
+        if(*i && (!spell || (*i)->GetId() != spell) && roll_chance_f(chance))
+        {
+            RemoveAurasDueToSpell((*i)->GetId());
+            if (!m_ccAuras.empty())
+                next = m_ccAuras.begin();
+            else
+                return;
+        }
+    }
+}
+
 uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellEntry const *spellProto, bool durabilityLoss)
 {
@@ -510 +534 @@
     if( damagetype != DOT)
     {
-        RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_STEALTH);
-
         if(pVictim->GetTypeId() == TYPEID_PLAYER && !pVictim->IsStandState() && !pVictim->hasUnitState(UNIT_STAT_STUNNED))
             pVictim->SetStandState(PLAYER_STATE_NONE);
@@ -889 +911 @@
 
         // TODO: Store auras by interrupt flag to speed this up.
-        AuraMap& vAuras = pVictim->GetAuras();
+        /*AuraMap& vAuras = pVictim->GetAuras();
         for (AuraMap::iterator i = vAuras.begin(), next; i != vAuras.end(); i = next)
         {
@@ -909 +931 @@
                 }
             }
-            else if ( (se->Attributes & SPELL_ATTR_BREAKABLE_BY_DAMAGE) && (!spellProto || se->Id != spellProto->Id) )
-            {
-                uint32 max_dmg = pVictim->getLevel() > 8 ? 25 * pVictim->getLevel() - 150 : 50;
-                float chance = float(damage) / max_dmg * 100.0f;
-                if (roll_chance_f(chance))
-                {
-                    pVictim->RemoveAurasDueToSpell(i->second->GetId());
-                    next = vAuras.begin();
-                }
-            }
-        }
+            else */
+        RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_DAMAGE);
+        pVictim->RemoveSpellbyDamageTaken(damage, spellProto ? spellProto->Id : 0);
 
         if (damagetype != NODAMAGE && damage && pVictim->GetTypeId() == TYPEID_PLAYER)
@@ -2193 +2207 @@
         return;
 
-    if(!pVictim->isInCombat() && pVictim->GetTypeId() != TYPEID_PLAYER && ((Creature*)pVictim)->AI())
-        ((Creature*)pVictim)->AI()->AttackStart(this);
-
-    SetInCombatWith(pVictim);
-    pVictim->SetInCombatWith(this);
-
-    if(Player* attackedPlayer = pVictim->GetCharmerOrOwnerPlayerOrPlayerItself())
-        SetContestedPvP(attackedPlayer);
+    CombatStart(pVictim);
 
     uint32 hitInfo;
@@ -3790 +3797 @@
         if(Aur->GetSpellProto()->AuraInterruptFlags)
             m_interruptableAuras.push_back(Aur);
+        if(Aur->GetSpellProto()->Attributes & SPELL_ATTR_BREAKABLE_BY_DAMAGE)
+        {
+            m_ccAuras.push_back(Aur);
+            RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CC);
+        }
     }
 
@@ -4153 +4165 @@
         if((*i).second->GetSpellProto()->AuraInterruptFlags)
             m_interruptableAuras.remove((*i).second);
+        if((*i).second->GetSpellProto()->Attributes & SPELL_ATTR_BREAKABLE_BY_DAMAGE)
+            m_ccAuras.remove((*i).second);
     }
 
@@ -8399 +8413 @@
         return;
 
-    RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOUNTING);
+    RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOUNT);
 
     SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, mount);
@@ -8467 +8481 @@
     }
     SetInCombatState(false);
+}
+
+void Unit::CombatStart(Unit* target)
+{
+    if(!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER && ((Creature*)target)->AI())
+        ((Creature*)target)->AI()->AttackStart(this);
+
+    SetInCombatWith(target);
+    target->SetInCombatWith(this);
+
+    if(Player* attackedPlayer = target->GetCharmerOrOwnerPlayerOrPlayerItself())
+        SetContestedPvP(attackedPlayer);
+
+    if(!isInCombat()) // remove this?
+        RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ATTACK);
 }