summaryrefslogtreecommitdiff
path: root/src/net/tmwa/charserverhandler.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2012-01-01 20:20:21 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2012-01-10 20:31:51 +0100
commit683da50e37fbbb2e3f70a4421a06dabd9bb912d8 (patch)
tree065526585f7af480df2eae40ed0acc1595331fd4 /src/net/tmwa/charserverhandler.cpp
parent8a88347e9ee6ce9f14d638cf602f3a763bc3ff01 (diff)
downloadmana-client-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.tar.gz
mana-client-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.tar.bz2
mana-client-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.tar.xz
mana-client-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.zip
player_node -> local_player
Reviewed-by: Ablu
Diffstat (limited to 'src/net/tmwa/charserverhandler.cpp')
-rw-r--r--src/net/tmwa/charserverhandler.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 2b7d5381..83682efe 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -153,13 +153,13 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
case SMSG_CHAR_MAP_INFO:
{
- msg.skip(4); // CharID, must be the same as player_node->charID
+ msg.skip(4); // CharID, must be the same as local_player->charID
GameHandler *gh = static_cast<GameHandler*>(Net::getGameHandler());
gh->setMap(msg.readString(16));
mapServer.hostname = ipToString(msg.readInt32());
mapServer.port = msg.readInt16();
- player_node = mSelectedCharacter->dummy;
+ local_player = mSelectedCharacter->dummy;
PlayerInfo::setBackend(mSelectedCharacter->data);
// Prevent the selected local player from being deleted
@@ -185,12 +185,12 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
mNetwork->disconnect();
Client::setState(STATE_CHANGE_MAP);
- Map *map = player_node->getMap();
+ Map *map = local_player->getMap();
const int tileWidth = map->getTileWidth();
const int tileHeight = map->getTileHeight();
- player_node->setPosition(Vector(x * tileWidth + tileWidth / 2,
+ local_player->setPosition(Vector(x * tileWidth + tileWidth / 2,
y * tileHeight + tileHeight / 2));
- player_node->setMap(0);
+ local_player->setMap(0);
}
break;
}