Synchronized pathfinding algorithmns with those used by the server to avoid asynchronisation.

2 files changed, 4 insertions, 9 deletions

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 05795cb1..f31ee48b 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -496,8 +496,7 @@ BeingHandler::handleBeingEnterMessage(MessageIn &msg)
             return;
     }
 
-    being->mX = px;
-    being->mY = py;
+    being->setPositionInPixels(px, py);
     being->setDestination(px, py);
     being->setAction(action);
 }
@@ -544,11 +543,10 @@ void BeingHandler::handleBeingsMoveMessage(MessageIn &msg)
         {
             being->setWalkSpeed(speed * 10);
         }
-        if (abs(being->mX - sx) + abs(being->mY - sy) > 4 * 32)
+        if (abs(being->getPixelX() - sx) + abs(being->getPixelY() - sy) > 4 * 32)
         {
             // Too large a desynchronization.
-            being->mX = sx;
-            being->mY = sy;
+            being->setPositionInPixels(sx, sy);
             being->setDestination(dx, dy);
         }
         else if (!(flags & MOVING_POSITION))
@@ -582,8 +580,6 @@ void BeingHandler::handleBeingAttackMessage(MessageIn &msg)
         case DIRECTION_RIGHT: being->setDirection(Being::RIGHT); break;
     }
 
-    logger->log("Attacktype: %d", attackType);
-
     being->setAction(Being::ATTACK, attackType);
 }
 
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 3c06d2f5..b908eae5 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -301,6 +301,5 @@ PlayerHandler::handleMapChangeMessage(MessageIn &msg)
     current_npc = 0;
 
     player_node->setAction(Being::STAND);
-    player_node->mX = x;
-    player_node->mY = y;
+    player_node->setPositionInPixels(x, y);
 }