From 87a0d6fee4d8b1608f751bac51c6d870437bd351 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Sat, 29 Jul 2006 04:15:55 +0000 Subject: [PATCH] always show bomb count if player has them --- ChangeLog | 4 ++++ main/gauges.c | 13 +++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0c9176a..ae7b0b58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,10 @@ * include/physfsx.h, main/inferno.c: move PhysicsFS initialisation, search path setup and argument reading to physfsx.h + * main/gauges.c: always show bomb count if player has them, + bombs may be the selected secondary weapon but the right view can + be a camera view (http://dxx-rebirth.de/smf/index.php?topic=58.0) + 2006-07-27 Chris Taylor * main/inferno.c, main/multi.c, main/multi.h: diff --git a/main/gauges.c b/main/gauges.c index baa23fba..ee9bbc15 100644 --- a/main/gauges.c +++ b/main/gauges.c @@ -1,4 +1,4 @@ -/* $Id: gauges.c,v 1.24 2006-07-09 14:58:43 chris Exp $ */ +/* $Id: gauges.c,v 1.25 2006-07-29 04:15:55 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -2356,13 +2356,10 @@ void draw_weapon_boxes() draw_secondary_ammo_info(Players[Player_num].secondary_ammo[Secondary_weapon]); old_ammo_count[1][VR_current_page] = Players[Player_num].secondary_ammo[Secondary_weapon]; - if (Secondary_weapon != which_bomb()) // don't draw two bomb counts - { - if (Cockpit_mode == CM_STATUS_BAR) - show_bomb_count(SB_BOMB_COUNT_X, SB_BOMB_COUNT_Y, gr_find_closest_color(0, 0, 0), 0); - else - show_bomb_count(BOMB_COUNT_X, BOMB_COUNT_Y, gr_find_closest_color(0, 0, 0), 0); - } + if (Cockpit_mode == CM_STATUS_BAR) + show_bomb_count(SB_BOMB_COUNT_X, SB_BOMB_COUNT_Y, gr_find_closest_color(0, 0, 0), 0); + else + show_bomb_count(BOMB_COUNT_X, BOMB_COUNT_Y, gr_find_closest_color(0, 0, 0), 0); } } else if (weapon_box_user[1] == WBU_STATIC) -- 2.39.2