diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-07-30 12:25:16 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-07-30 12:25:16 +0300 |
commit | 1680d159ecbf75591d2dab1416ff8144c27d4de5 (patch) | |
tree | cd34ad27487036265f08d7aa63476c160280d899 /src/net/ea/charserverhandler.cpp | |
parent | 9913b4b481ddcaf0fa8499f3554c85bb588be7f0 (diff) | |
download | manaplus-1680d159ecbf75591d2dab1416ff8144c27d4de5.tar.gz manaplus-1680d159ecbf75591d2dab1416ff8144c27d4de5.tar.bz2 manaplus-1680d159ecbf75591d2dab1416ff8144c27d4de5.tar.xz manaplus-1680d159ecbf75591d2dab1416ff8144c27d4de5.zip |
Rename player_node variable into localPlayer.
Diffstat (limited to 'src/net/ea/charserverhandler.cpp')
-rw-r--r-- | src/net/ea/charserverhandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index a0358dbb4..bb89a10e6 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -241,7 +241,7 @@ void CharServerHandler::processCharMapInfo(Net::MessageIn &restrict msg, ServerInfo &restrict server) { BLOCK_START("CharServerHandler::processCharMapInfo") -// msg.skip(4); // CharID, must be the same as player_node->charID +// msg.skip(4); // CharID, must be the same as localPlayer->charID PlayerInfo::setCharId(msg.readInt32()); GameHandler *const gh = static_cast<GameHandler*>(Net::getGameHandler()); gh->setMap(msg.readString(16)); @@ -257,7 +257,7 @@ void CharServerHandler::processCharMapInfo(Net::MessageIn &restrict msg, server.port = msg.readInt16(); // Prevent the selected local player from being deleted - player_node = mSelectedCharacter->dummy; + localPlayer = mSelectedCharacter->dummy; PlayerInfo::setBackend(mSelectedCharacter->data); mSelectedCharacter->dummy = nullptr; @@ -291,10 +291,10 @@ void CharServerHandler::processChangeMapServer(Net::MessageIn &restrict msg, network->disconnect(); client->setState(STATE_CHANGE_MAP); - if (player_node) + if (localPlayer) { - player_node->setTileCoords(x, y); - player_node->setMap(nullptr); + localPlayer->setTileCoords(x, y); + localPlayer->setMap(nullptr); } BLOCK_END("CharServerHandler::processChangeMapServer") } |