summaryrefslogtreecommitdiff
path: root/src/net/playerhandler.cpp
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2006-07-19 15:12:06 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2006-07-19 15:12:06 +0000
commit4050f8c0bced625a95d542d30647c3f8bbf2267b (patch)
tree420d65a5ed6a2155762b4e13a4c90ab2df9f888e /src/net/playerhandler.cpp
parentda3a1fd114dd7b8e5e8c880bd987506acc16ac42 (diff)
downloadmana-client-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.gz
mana-client-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.bz2
mana-client-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.xz
mana-client-4050f8c0bced625a95d542d30647c3f8bbf2267b.zip
Merged new_animation branch until r2415 into trunk.
Diffstat (limited to 'src/net/playerhandler.cpp')
-rw-r--r--src/net/playerhandler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 070fb112..94788333 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -104,7 +104,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
current_npc = 0;
- player_node->mAction = Being::STAND;
+ player_node->setAction(Being::STAND);
player_node->stopAttack();
player_node->mFrame = 0;
player_node->mX = x;
@@ -163,7 +163,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
deathNotice = new OkDialog("Message",
"You're now dead, press ok to restart");
deathNotice->addActionListener(&deathListener);
- player_node->mAction = Being::DEAD;
+ player_node->setAction(Being::DEAD);
}
}
break;