Changeset 267 for trunk/src/game/GridNotifiers.h

Timestamp:

11/21/08 16:54:14 (17 years ago)

Author:

yumileroy

Message:

*Let creature search nearby target before enter evade mode
*Add function canStartAttack to reduce code in MoveInLineOfSight?
*Fix a bug that cancelling bind sight auras may crash the server

Original author: megamage
Date: 2008-11-21 10:07:11-06:00

Files:

• trunk/src/game/GridNotifiers.h (modified) (3 diffs)

trunk/src/game/GridNotifiers.h

@@ -702 +702 @@
     {
         public:
-            explicit NearestHostileUnitInAttackDistanceCheck(Creature* creature, float dist = 0) : m_creature(creature) 
+            explicit NearestHostileUnitInAttackDistanceCheck(Creature const* creature, float dist = 0) : m_creature(creature) 
             {
                 m_range = (dist == 0 ? 9999 : dist);
@@ -709 +709 @@
             bool operator()(Unit* u)
             {
-                if(!u->isAlive() || !m_creature->IsHostileTo(u))
-                    return false;
-
-                float dist;
-                if(m_force) dist = m_range;
+                // TODO: addthreat for every enemy in range?
+                if(!m_creature->IsWithinDistInMap(u, m_range))
+                    return false;
+
+                if(m_force)
+                {
+                    if(!m_creature->canAttack(u))
+                        return false;
+                }
                 else
                 {
-                    dist = m_creature->GetAttackDistance(u);
-                    if(dist > m_range) dist = m_range;
+                    if(!m_creature->canStartAttack(u))
+                        return false;
                 }
-                if(!m_creature->IsWithinDistInMap(u, dist))
-                    return false;
-
-                if(!m_creature->canSeeOrDetect(u, true, false))
-                    return false;
 
                 m_range = m_creature->GetDistance(u);
@@ -730 +729 @@
             float GetLastRange() const { return m_range; }
         private:
-            Creature* const m_creature;
+            Creature const *m_creature;
             float m_range;
             bool m_force;