Index: /trunk/src/game/ReactorAI.cpp
===================================================================
--- /trunk/src/game/ReactorAI.cpp (revision 102)
+++ /trunk/src/game/ReactorAI.cpp (revision 156)
@@ -77,5 +77,5 @@
     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());
Index: /trunk/src/game/GuardAI.cpp
===================================================================
--- /trunk/src/game/GuardAI.cpp (revision 102)
+++ /trunk/src/game/GuardAI.cpp (revision 156)
@@ -118,5 +118,5 @@
     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());
Index: /trunk/src/game/AggressorAI.cpp
===================================================================
--- /trunk/src/game/AggressorAI.cpp (revision 102)
+++ /trunk/src/game/AggressorAI.cpp (revision 156)
@@ -125,5 +125,5 @@
     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());
Index: /trunk/src/game/PetAI.cpp
===================================================================
--- /trunk/src/game/PetAI.cpp (revision 135)
+++ /trunk/src/game/PetAI.cpp (revision 156)
@@ -165,5 +165,5 @@
             }
             // 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());