summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-25 19:37:34 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-25 19:37:34 +0300
commitc3a177ac7e5c5706622349031316839aaed1ede1 (patch)
tree608ebfc33859364715dc885272900109e938e1ab
parent3dd279181c4eee649dabf57fae9d98dde666489a (diff)
downloadmanaplus-c3a177ac7e5c5706622349031316839aaed1ede1.tar.gz
manaplus-c3a177ac7e5c5706622349031316839aaed1ede1.tar.bz2
manaplus-c3a177ac7e5c5706622349031316839aaed1ede1.tar.xz
manaplus-c3a177ac7e5c5706622349031316839aaed1ede1.zip
Some fixed for evol range attack changes.
-rw-r--r--src/localplayer.cpp5
1 files changed, 3 insertions, 2 deletions
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);