Changeset 156

Timestamp:

11/19/08 13:41:28 (17 years ago)

Author:

yumileroy

Message:

[svn] Use IsWithinCombatDist? for all AI. This should fix the bug that pet and guard does not attack target. (Note: some scriptedAI may need to update)

Original author: megamage
Date: 2008-11-03 14:11:09-06:00

Location:

trunk/src/game

Files:

• AggressorAI.cpp (modified) (1 diff)
• GuardAI.cpp (modified) (1 diff)
• PetAI.cpp (modified) (1 diff)
• ReactorAI.cpp (modified) (1 diff)

trunk/src/game/AggressorAI.cpp

@@ -125 +125 @@
     if( i_creature.isAttackReady() )
     {
-        if( i_creature.IsWithinDistInMap(i_creature.getVictim(), ATTACK_DISTANCE))
+        if( i_creature.IsWithinCombatDist(i_creature.getVictim(), ATTACK_DISTANCE))
         {
             i_creature.AttackerStateUpdate(i_creature.getVictim());

trunk/src/game/GuardAI.cpp

@@ -118 +118 @@
     if( i_creature.isAttackReady() )
     {
-        if( i_creature.IsWithinDistInMap(i_creature.getVictim(), ATTACK_DISTANCE))
+        if( i_creature.IsWithinCombatDist(i_creature.getVictim(), ATTACK_DISTANCE))
         {
             i_creature.AttackerStateUpdate(i_creature.getVictim());

trunk/src/game/PetAI.cpp

@@ -165 +165 @@
             }
             // not required to be stopped case
-            else if( i_pet.isAttackReady() && i_pet.canReachWithAttack(i_pet.getVictim()) )
+            else if( i_pet.isAttackReady() && i_pet.IsWithinCombatDist(i_pet.getVictim(), ATTACK_DISTANCE) )
             {
                 i_pet.AttackerStateUpdate(i_pet.getVictim());

trunk/src/game/ReactorAI.cpp

@@ -77 +77 @@
     if( i_creature.isAttackReady() )
     {
-        if( i_creature.IsWithinDistInMap(i_creature.getVictim(), ATTACK_DISTANCE))
+        if( i_creature.IsWithinCombatDist(i_creature.getVictim(), ATTACK_DISTANCE))
         {
             i_creature.AttackerStateUpdate(i_creature.getVictim());