Changed to pixel-based coordinates for beings.

2 files changed, 6 insertions, 8 deletions

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 4ff92b63..ac2801c2 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -422,16 +422,16 @@ void BeingHandler::handleBeingsMoveMessage(MessageIn &msg)
         int sx = msg.readShort(), sy = msg.readShort(),
             dx = msg.readShort(), dy = msg.readShort();
         bool update = being != player_node; // the local player already knows where he wants to go
-        if (abs(being->mX - sx / 32) + abs(being->mY - sy / 32) > 4)
+        if (abs(being->mX - sx) + abs(being->mY - sy) > 4 * 32)
         {
             // crude handling of synchronization messages
-            being->mX = sx / 32;
-            being->mY = sy / 32;
+            being->mX = sx;
+            being->mY = sy;
             update = true;
         }
         if (update)
         {
-            being->setDestination(dx / 32, dy / 32);
+            being->setDestination(dx, dy);
         }
     }
 }
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index c73aa2da..fc6bb37d 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -321,10 +321,8 @@ PlayerHandler::handleMapChangeMessage(MessageIn &msg)
     player_node->stopAttack();
     player_node->mFrame = 0;
 
-    // TODO: Server is sending pixel coordinates. Client will need to work with
-    // these instead of converting them to tile coordinates.
-    player_node->mX = x / 32;
-    player_node->mY = y / 32;
+    player_node->mX = x;
+    player_node->mY = y;
 
     if (newServer)
     {