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

Timestamp:

11/22/08 00:35:41 (17 years ago)

Author:

yumileroy

Message:

Delete possessed AI only on creature delete.

Original author: gvcoman
Date: 2008-11-16 14:38:02-05:00

Files:

• trunk/src/game/GridNotifiers.h (modified) (1 diff)

trunk/src/game/GridNotifiers.h

@@ -699 +699 @@
     // Creature checks
 
-    class NearestHostileUnitInAttackDistanceCheck
-    {
-        public:
-            explicit NearestHostileUnitInAttackDistanceCheck(Creature const* creature, float dist = 0) : m_creature(creature) 
-            {
-                m_range = (dist == 0 ? 9999 : dist);
-                m_force = (dist == 0 ? false : true);
-            }
-            bool operator()(Unit* u)
-            {
-                // 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
-                {
-                    if(!m_creature->canStartAttack(u))
-                        return false;
-                }
-
-                m_range = m_creature->GetDistance(u);
-                return true;
-            }
-            float GetLastRange() const { return m_range; }
-        private:
-            Creature const *m_creature;
-            float m_range;
-            bool m_force;
-            NearestHostileUnitInAttackDistanceCheck(NearestHostileUnitInAttackDistanceCheck const&);
+    class InAttackDistanceFromAnyHostileCreatureCheck
+    {
+        public:
+            explicit InAttackDistanceFromAnyHostileCreatureCheck(Unit* funit) : i_funit(funit) {}
+            bool operator()(Creature* u)
+            {
+                if(u->isAlive() && u->IsHostileTo(i_funit) && i_funit->IsWithinDistInMap(u, u->GetAttackDistance(i_funit)))
+                    return true;
+
+                return false;
+            }
+        private:
+            Unit* const i_funit;
     };