*Update melee range calculation. By QAston.

--HG--
branch : trunk

1 files changed, 2 insertions, 4 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index d16dac54f54..05204fe9c78 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1106,11 +1106,9 @@ void Player::Update( uint32 p_time )
             // default combat reach 10
             // TODO add weapon,skill check
 
-            float pldistance = ATTACK_DISTANCE;
-
             if (isAttackReady(BASE_ATTACK))
             {
-                if(!IsWithinCombatDist(pVictim, pldistance))
+                if(!IsWithinMeleeRange(pVictim))
                 {
                     setAttackTimer(BASE_ATTACK,100);
                     if(m_swingErrorMsg != 1)                // send single time (client auto repeat)
@@ -1147,7 +1145,7 @@ void Player::Update( uint32 p_time )
 
             if ( haveOffhandWeapon() && isAttackReady(OFF_ATTACK))
             {
-                if(!IsWithinCombatDist(pVictim, pldistance))
+                if(!IsWithinMeleeRange(pVictim))
                 {
                     setAttackTimer(OFF_ATTACK,100);
                 }