summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorCedric Borgese <cedric.borgese@gmail.com>2005-07-22 17:27:59 +0000
committerCedric Borgese <cedric.borgese@gmail.com>2005-07-22 17:27:59 +0000
commit5731ddbf5ef5fa1556a7c5f84c0c71865a15499b (patch)
tree967cfacdf62a8930be9691152746b6f0e6b35a6e /src/net
parent4333effa0e80c996c91e4014cf449c30a32120b7 (diff)
downloadmana-client-5731ddbf5ef5fa1556a7c5f84c0c71865a15499b.tar.gz
mana-client-5731ddbf5ef5fa1556a7c5f84c0c71865a15499b.tar.bz2
mana-client-5731ddbf5ef5fa1556a7c5f84c0c71865a15499b.tar.xz
mana-client-5731ddbf5ef5fa1556a7c5f84c0c71865a15499b.zip
Merge between moi1392's branch and head
Diffstat (limited to 'src/net')
-rw-r--r--src/net/protocol.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp
index fac6b11d..5a3fd487 100644
--- a/src/net/protocol.cpp
+++ b/src/net/protocol.cpp
@@ -272,9 +272,9 @@ void attack(Being *target)
char_info->lastAttackTime = 0;
player_node->action = ATTACK;
- action(0, target->id);
+ action(0, target->getId());
player_node->walk_time = tick_time;
- if (player_node->weapon == 2)
+ if (player_node->getWeapon() == 2)
sound.playSfx("sfx/bow_shoot_1.ogg");
else
sound.playSfx("sfx/fist-swish.ogg");