From c3a177ac7e5c5706622349031316839aaed1ede1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 25 Jan 2012 19:37:34 +0300
Subject: Some fixed for evol range attack changes.

---
 src/localplayer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/localplayer.cpp')

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 0da291711..3df4a3214 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -1782,7 +1782,7 @@ void LocalPlayer::moveToTarget(unsigned int dist)
                 case 6:
                 case 7:
                     dist = mAttackRange;
-                    if (dist == 1)
+                    if (dist == 1 && serverVersion < 1)
                         dist = 2;
                 default:
                     break;
@@ -3716,7 +3716,8 @@ void LocalPlayer::attack2(Being *target, bool keep, bool dontChangeEquipment)
         changeEquipmentBeforeAttack(target);
 
     if ((!target || getAttackType() == 0 || getAttackType() == 3)
-        || (withinAttackRange(target, true, 1)
+        || (withinAttackRange(target, serverVersion < 1,
+        serverVersion < 1 ? 1 : 0)
         && getPathLength(target) <= getAttackRange2()))
     {
         attack(target, keep);
-- 
cgit v1.2.3-60-g2f50