Merged the movement branch into trunk

I consider this the only way forward. In my tests this code isn't actually
doing worse than what was there before. Of course some cases are a bit broken,
and I'm open to any kind of feedback so that we can fix those issues.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index ea581095..3c0a1835 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -302,11 +302,12 @@ PlayerHandler::handleMapChangeMessage(MessageIn &msg)
 
     current_npc = 0;
 
-    const float scrollOffsetX = x - player_node->mX;
-    const float scrollOffsetY = y - player_node->mY;
+    const Vector &playerPos = player_node->getPosition();
+    const float scrollOffsetX = x - (int) playerPos.x;
+    const float scrollOffsetY = y - (int) playerPos.y;
 
     player_node->setAction(Being::STAND);
-    player_node->setPositionInPixels(x, y);
+    player_node->setPosition(x, y);
 
     logger->log("Adjust scrolling by %d,%d", (int) scrollOffsetX,
                                              (int) scrollOffsetY);