From e6b473b7522c331cb8d2c62e8a2d05e0840800db Mon Sep 17 00:00:00 2001 From: Michal Zima Date: Mon, 7 Jun 2010 20:35:00 +0200 Subject: [BUGFIX] Player uses other gun than he expects --- src/screen/world.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/screen') diff --git a/src/screen/world.c b/src/screen/world.c index b1043a1..3d3214b 100644 --- a/src/screen/world.c +++ b/src/screen/world.c @@ -243,12 +243,16 @@ static void control_keyboard(tux_t *tux, control_t *control) switch (control_get_key_action(control)) { case CONTROL_SHOT: - netAction(tux, TUX_SHOT); - tux_action(tux, TUX_SHOT); + if (tux->isCanShot == TRUE) { + netAction(tux, TUX_SHOT); + tux_action(tux, TUX_SHOT); + } break; case CONTROL_SWITCH: - netAction(tux, TUX_SWITCH_GUN); - tux_action(tux, TUX_SWITCH_GUN); + if (tux->isCanSwitchGun == TRUE) { + netAction(tux, TUX_SWITCH_GUN); + tux_action(tux, TUX_SWITCH_GUN); + } break; } } -- cgit v1.2.3