From 5731ddbf5ef5fa1556a7c5f84c0c71865a15499b Mon Sep 17 00:00:00 2001 From: Cedric Borgese Date: Fri, 22 Jul 2005 17:27:59 +0000 Subject: Merge between moi1392's branch and head --- src/net/protocol.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/net/protocol.cpp') 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"); -- cgit v1.2.3-70-g09d2