Changeset 186 for trunk/src/game/Unit.cpp

Timestamp:

11/19/08 13:44:25 (17 years ago)

Author:

yumileroy

Message:

[svn] Remove isVisible function. Check stealth and invisible in canAttack();
Use new remove aura by interrupt flag function.

Original author: megamage
Date: 2008-11-07 09:36:46-06:00

Files:

• trunk/src/game/Unit.cpp (modified) (6 diffs)

trunk/src/game/Unit.cpp

@@ -464 +464 @@
 }
 
-void Unit::RemoveInterruptableAura(uint32 flag)
+void Unit::RemoveAurasWithInterruptFlags(uint32 flag)
 {
     AuraList::iterator iter, next;
@@ -510 +510 @@
     if( damagetype != DOT)
     {
-        RemoveInterruptableAura(AURA_INTERRUPT_FLAG_STEALTH);
+        RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_STEALTH);
 
         if(pVictim->GetTypeId() == TYPEID_PLAYER && !pVictim->IsStandState() && !pVictim->hasUnitState(UNIT_STAT_STUNNED))
@@ -4101 +4101 @@
                 ++iter;
         }
-    }
-}
-
-void Unit::RemoveAurasWithInterruptFlags(uint32 flags)
-{
-    for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end(); )
-    {
-        if (iter->second->GetSpellProto()->AuraInterruptFlags & flags)
-            RemoveAura(iter);
-        else
-            ++iter;
     }
 }
@@ -8507 +8496 @@
 }
 
+//TODO: remove this function
 bool Unit::isTargetableForAttack() const
 {
-    if (GetTypeId()==TYPEID_PLAYER && ((Player *)this)->isGameMaster())
+    return isAttackableByAOE() && !hasUnitState(UNIT_STAT_DIED);
+}
+
+bool Unit::canAttack(Unit const* target) const
+{
+    assert(target);
+
+    if(!target->isAttackableByAOE() || target->hasUnitState(UNIT_STAT_DIED))
+        return false;
+
+    if((m_invisibilityMask || target->m_invisibilityMask) && !canDetectInvisibilityOf(target))
+        return false;
+
+    if(target->GetVisibility() == VISIBILITY_GROUP_STEALTH && !canDetectStealthOf(target, GetDistance(target)))
+        return false;
+
+    return true;
+}
+
+bool Unit::isAttackableByAOE() const
+{
+    if(!isAlive())
         return false;
 
@@ -8515 +8526 @@
         return false;
 
-    return isAlive() && !hasUnitState(UNIT_STAT_DIED)&& !isInFlight() /*&& !isStealth()*/;
+    if(GetTypeId()==TYPEID_PLAYER && ((Player *)this)->isGameMaster())
+        return false;
+
+    return !isInFlight();
 }
 
@@ -9067 +9081 @@
         for(AttackerSet::const_iterator itr = m_attackers.begin(); itr != m_attackers.end(); ++itr)
         {
-            if( (*itr)->IsInMap(this) && (*itr)->isTargetableForAttack() && (*itr)->isInAccessablePlaceFor((Creature*)this) )
+            if( (*itr)->IsInMap(this) && canAttack(*itr) && (*itr)->isInAccessablePlaceFor((Creature*)this) )
                 return false;
         }