Applied fixes requested by cody.

- Made the map teleport distance fixed for manaserv.
- Small cleanups.

The branch is considered reviewed by: Cody.

Resolves Mana-Mantis: #74.

4 files changed, 8 insertions, 10 deletions

diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index ec71143f..a114da3d 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -50,7 +50,7 @@
  * everything beyond will reset the port hard.
  * @todo: Make this parameter read from config.
  */
-static const int MAP_TELEPORT_SCROLL_DISTANCE = 8;
+const int MAP_TELEPORT_SCROLL_DISTANCE = 256;
 
 extern Net::PlayerHandler *playerHandler;
 
@@ -297,10 +297,8 @@ void PlayerHandler::handleMapChangeMessage(Net::MessageIn &msg)
 
     /* Scroll if neccessary */
     if (!sameMap
-            || (abs(x - (int) playerPos.x) > MAP_TELEPORT_SCROLL_DISTANCE
-                * game->getCurrentTileWidth())
-            || (abs(y - (int) playerPos.y) > MAP_TELEPORT_SCROLL_DISTANCE
-                * game->getCurrentTileHeight()))
+            || (abs(x - (int) playerPos.x) > MAP_TELEPORT_SCROLL_DISTANCE)
+            || (abs(y - (int) playerPos.y) > MAP_TELEPORT_SCROLL_DISTANCE))
     {
         scrollOffsetX = x - (int) playerPos.x;
         scrollOffsetY = y - (int) playerPos.y;
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index dcc68fb3..1df84b84 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -186,8 +186,8 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
             mNetwork->disconnect();
             Client::setState(STATE_CHANGE_MAP);
             Map *map = player_node->getMap();
-            int tileWidth = map->getTileWidth();
-            int tileHeight = map->getTileHeight();
+            const int tileWidth = map->getTileWidth();
+            const int tileHeight = map->getTileHeight();
             player_node->setPosition(Vector(x * tileWidth + tileWidth / 2,
                                             y * tileHeight + tileHeight / 2));
             player_node->setMap(0);
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index 8ba2e200..6430b476 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -109,8 +109,8 @@ void GameHandler::event(Event::Channel channel, const Event &event)
             Game *game = Game::instance();
             game->changeMap(mMap);
             Map *map = game->getCurrentMap();
-            int tileWidth = map->getTileWidth();
-            int tileHeight = map->getTileHeight();
+            const int tileWidth = map->getTileWidth();
+            const int tileHeight = map->getTileHeight();
             if (mTileX && mTileY)
             {
                 player_node->setPosition(Vector(mTileX * tileWidth + tileWidth / 2,
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index ab63cc1d..f30baecd 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -50,7 +50,7 @@ extern OkDialog *deathNotice;
 
 // Max. distance we are willing to scroll after a teleport;
 // everything beyond will reset the port hard.
-static const int MAP_TELEPORT_SCROLL_DISTANCE = 8;
+const int MAP_TELEPORT_SCROLL_DISTANCE = 8;
 
 // TODO Move somewhere else
 namespace {