From 4037fe355f8e5cdef1dd46f5e65cccaa78e69443 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Fri, 29 Jul 2005 07:51:47 +0000 Subject: [PATCH] only shoot when fire button down (fix bug #2271) --- ChangeLog | 2 ++ main/game.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4c2b2f9..36a41b49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * 2d/font.c: show some missing wide 1's (bug #2269) + * main/game.c: only shoot when fire button down (fix bug #2271) + 2005-07-28 Chris Taylor * main/gauges.c: show gauges in SDL (help fix bug #2267) diff --git a/main/game.c b/main/game.c index d293fcea..3102e848 100644 --- a/main/game.c +++ b/main/game.c @@ -1,4 +1,4 @@ -/* $Id: game.c,v 1.37 2005-06-22 09:08:21 chris Exp $ */ +/* $Id: game.c,v 1.38 2005-07-29 07:51:16 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char game_rcsid[] = "$Id: game.c,v 1.37 2005-06-22 09:08:21 chris Exp $"; +char game_rcsid[] = "$Id: game.c,v 1.38 2005-07-29 07:51:16 chris Exp $"; #endif #ifdef WINDOWS @@ -3097,7 +3097,7 @@ int add_flicker(int segnum, int sidenum, fix delay, unsigned long mask) void FireLaser() { - Global_laser_firing_count += Weapon_info[Primary_weapon_to_weapon_info[Primary_weapon]].fire_count * (Controls.fire_primary_state || Controls.fire_primary_down_count); + Global_laser_firing_count = Weapon_info[Primary_weapon_to_weapon_info[Primary_weapon]].fire_count * (Controls.fire_primary_state || Controls.fire_primary_down_count); if ((Primary_weapon == FUSION_INDEX) && (Global_laser_firing_count)) { if ((Players[Player_num].energy < F1_0*2) && (Auto_fire_fusion_cannon_time == 0)) { -- 2.39.2