summaryrefslogtreecommitdiff
path: root/src/net/tmwa/charserverhandler.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-06-22 18:58:47 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-06-22 18:58:47 +0200
commit852ff45c35c422b5264487669934b392a8657465 (patch)
tree380751fae34a7dcd7b31bd84e303b9086eb17485 /src/net/tmwa/charserverhandler.cpp
parent2a11c6c5d874d661dcb7f016183c3c3e64e65f3c (diff)
parentec3c689c64922baf4a9f99bc6e9345e0a80403e8 (diff)
downloadmana-client-852ff45c35c422b5264487669934b392a8657465.tar.gz
mana-client-852ff45c35c422b5264487669934b392a8657465.tar.bz2
mana-client-852ff45c35c422b5264487669934b392a8657465.tar.xz
mana-client-852ff45c35c422b5264487669934b392a8657465.zip
Merge branch 'master' of gitorious.org:~bertram/mana/mana-any-square-tile-size
Diffstat (limited to 'src/net/tmwa/charserverhandler.cpp')
-rw-r--r--src/net/tmwa/charserverhandler.cpp4
1 files changed, 2 insertions, 2 deletions
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);