Merge branch 'master' of gitorious.org:~bertram/mana/mana-any-square-tile-size

4 files changed, 7 insertions, 8 deletions

diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 4249bac8..a114da3d 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -46,12 +46,11 @@
 #include "net/manaserv/attributes.h"
 
 /**
- * Max. distance we are willing to scroll after a teleport;
+ * Max. distance in tiles we are willing to scroll after a teleport;
  * everything beyond will reset the port hard.
- * 32 is the nominal tile width/height.
  * @todo: Make this parameter read from config.
  */
-static const int MAP_TELEPORT_SCROLL_DISTANCE = 8 * 32;
+const int MAP_TELEPORT_SCROLL_DISTANCE = 256;
 
 extern Net::PlayerHandler *playerHandler;
 
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 {