Changeset 267 for trunk/src/game/Creature.cpp

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/Creature.cpp (modified) (3 diffs)

trunk/src/game/Creature.cpp

@@ -1544 +1544 @@
 }
 
+bool Creature::canStartAttack(Unit const* who) const
+{
+    if(!who->isInAccessiblePlaceFor(this)
+        || !canFly() && GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE
+        || !IsWithinDistInMap(who, GetAttackDistance(who)))
+        return false;
+
+    if(!canAttack(who))
+        return false;
+
+    return IsWithinLOSInMap(who);
+}
+
 float Creature::GetAttackDistance(Unit const* pl) const
 {
@@ -1825 +1838 @@
 Unit* Creature::SelectNearestTarget(float dist) const
 {
-    /*CellPair p(Trinity::ComputeCellPair(GetPositionX(), GetPositionY()));
+    CellPair p(Trinity::ComputeCellPair(GetPositionX(), GetPositionY()));
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
 
-    Unit *target;
+    Unit *target = NULL;
 
     {
@@ -1840 +1853 @@
 
         CellLock<GridReadGuard> cell_lock(cell, p);
-        cell_lock->Visit(cell_lock, world_unit_searcher, GetMap());
-        cell_lock->Visit(cell_lock, grid_unit_searcher, GetMap());
-    }*/
-    return NULL;
+        cell_lock->Visit(cell_lock, world_unit_searcher, *GetMap());
+        cell_lock->Visit(cell_lock, grid_unit_searcher, *GetMap());
+    }
+
+    return target;
 }