summaryrefslogtreecommitdiff
path: root/src/net/manaserv/playerhandler.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/manaserv/playerhandler.cpp
parent8a88347e9ee6ce9f14d638cf602f3a763bc3ff01 (diff)
downloadmana-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.tar.gz
mana-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.tar.bz2
mana-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.tar.xz
mana-683da50e37fbbb2e3f70a4421a06dabd9bb912d8.zip
player_node -> local_player
Reviewed-by: Ablu
Diffstat (limited to 'src/net/manaserv/playerhandler.cpp')
-rw-r--r--src/net/manaserv/playerhandler.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index d7c3dab6..43af40f5 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -105,7 +105,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
gameServerConnection->disconnect();
Client::setState(STATE_CHANGE_MAP);
- player_node->setMap(0);
+ local_player->setMap(0);
} break;
case GPMSG_PLAYER_ATTRIBUTE_CHANGE:
@@ -154,7 +154,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
paths.getStringValue("particles")
+ paths.getStringValue("levelUpEffectFile")
,0, 0);
- player_node->controlParticle(effect);
+ local_player->controlParticle(effect);
} break;
@@ -291,7 +291,7 @@ void PlayerHandler::handleMapChangeMessage(Net::MessageIn &msg)
// Switch the actual map, deleting the previous one
game->changeMap(mapName);
- const Vector &playerPos = player_node->getPosition();
+ const Vector &playerPos = local_player->getPosition();
float scrollOffsetX = 0.0f;
float scrollOffsetY = 0.0f;
@@ -304,9 +304,9 @@ void PlayerHandler::handleMapChangeMessage(Net::MessageIn &msg)
scrollOffsetY = y - (int) playerPos.y;
}
- player_node->setAction(Being::STAND);
- player_node->setPosition(x, y);
- player_node->setDestination(x, y);
+ local_player->setAction(Being::STAND);
+ local_player->setPosition(x, y);
+ local_player->setDestination(x, y);
logger->log("Adjust scrolling by %d,%d", (int) scrollOffsetX,
(int) scrollOffsetY);
@@ -373,7 +373,7 @@ void PlayerHandler::setDestination(int x, int y, int /* direction */)
void PlayerHandler::changeAction(Being::Action action)
{
- player_node->setAction(action);
+ local_player->setAction(action);
MessageOut msg(PGMSG_ACTION_CHANGE);
msg.writeInt8(action);