From caf62e4d1c039f8d4d33bfd05f476890fdc79fcf Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 27 Apr 2012 23:03:43 +0300
Subject: Improve screen position calculation.

---
 src/net/ea/playerhandler.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/net/ea/playerhandler.cpp')

diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index bfbef0798..8f4cfd411 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -216,8 +216,8 @@ void PlayerHandler::processPlayerWarp(Net::MessageIn &msg)
     mapPath = mapPath.substr(0, mapPath.rfind("."));
     game->changeMap(mapPath);
 
-    float scrollOffsetX = 0.0f;
-    float scrollOffsetY = 0.0f;
+    int scrollOffsetX = 0;
+    int scrollOffsetY = 0;
 
     if (player_node)
     {
@@ -239,12 +239,10 @@ void PlayerHandler::processPlayerWarp(Net::MessageIn &msg)
                 || (abs(y - player_node->getTileY())
                 > MAP_TELEPORT_SCROLL_DISTANCE))
             {
-                scrollOffsetX = static_cast<float>((x
-                    - player_node->getTileX())
-                    * map->getTileWidth());
-                scrollOffsetY = static_cast<float>((y
-                    - player_node->getTileY())
-                    * map->getTileHeight());
+                scrollOffsetX = (x - player_node->getTileX())
+                    * map->getTileWidth();
+                scrollOffsetY = (y - player_node->getTileY())
+                    * map->getTileHeight();
             }
         }
 
@@ -253,9 +251,7 @@ void PlayerHandler::processPlayerWarp(Net::MessageIn &msg)
         player_node->navigateClean();
     }
 
-    logger->log("Adjust scrolling by %d:%d",
-        static_cast<int>(scrollOffsetX),
-        static_cast<int>(scrollOffsetY));
+    logger->log("Adjust scrolling by %d:%d", scrollOffsetX, scrollOffsetY);
 
     if (viewport)
     {
-- 
cgit v1.2.3-70-g09d2