diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-06-22 18:51:36 +0200 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-06-22 18:51:36 +0200 |
commit | ec3c689c64922baf4a9f99bc6e9345e0a80403e8 (patch) | |
tree | 7d8a17271650f199e7f90b47a4f40532b28de25d /src/net/tmwa | |
parent | 2e08f723375023e203654381b2a49d63c9565824 (diff) | |
download | mana-client-ec3c689c64922baf4a9f99bc6e9345e0a80403e8.tar.gz mana-client-ec3c689c64922baf4a9f99bc6e9345e0a80403e8.tar.bz2 mana-client-ec3c689c64922baf4a9f99bc6e9345e0a80403e8.tar.xz mana-client-ec3c689c64922baf4a9f99bc6e9345e0a80403e8.zip |
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.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 4 | ||||
-rw-r--r-- | src/net/tmwa/gamehandler.cpp | 4 | ||||
-rw-r--r-- | src/net/tmwa/playerhandler.cpp | 2 |
3 files changed, 5 insertions, 5 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); 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 { |