TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

draw the bomb count in OpenGL, but not when a bomb is selected as a secondary weapon

Browse source
This commit is contained in:
Chris Taylor 2005-02-25 06:24:52 +00:00
parent 3acb243fe0
commit 8de16c97e9
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -12,6 +12,9 @@
* main/gauges.c: draw behind the shield number properly with OpenGL * main/gauges.c: draw behind the shield number properly with OpenGL
* main/gauges.c: draw the bomb count in OpenGL, but not when a bomb
is selected as a secondary weapon
2005-02-11 Bradley Bell <btb@icculus.org> 2005-02-11 Bradley Bell <btb@icculus.org>
* debian/control: build-dep on libphysfs-dev * debian/control: build-dep on libphysfs-dev

14
main/gauges.c
View file

@ -1,4 +1,4 @@
/* $Id: gauges.c,v 1.15 2005-02-25 06:16:57 chris Exp $ */ /* $Id: gauges.c,v 1.16 2005-02-25 06:24:52 chris Exp $ */
/* /*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -2705,6 +2705,14 @@ void draw_weapon_boxes()
newdemo_record_secondary_ammo(old_ammo_count[1][VR_current_page], Players[Player_num].secondary_ammo[Secondary_weapon]); newdemo_record_secondary_ammo(old_ammo_count[1][VR_current_page], Players[Player_num].secondary_ammo[Secondary_weapon]);
draw_secondary_ammo_info(Players[Player_num].secondary_ammo[Secondary_weapon]); 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]; 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);
}
} }
} }
else if (weapon_box_user[1] == WBU_STATIC) else if (weapon_box_user[1] == WBU_STATIC)
@ -3494,8 +3502,6 @@ void render_gauges()
show_homing_warning(); show_homing_warning();
show_bomb_count(BOMB_COUNT_X,BOMB_COUNT_Y,gr_find_closest_color(0,0,0),0);
} else if (Cockpit_mode == CM_STATUS_BAR) { } else if (Cockpit_mode == CM_STATUS_BAR) {
{ {
@ -3566,8 +3572,6 @@ void render_gauges()
//if (score_time) //if (score_time)
sb_show_score_added(); sb_show_score_added();
} }
show_bomb_count(SB_BOMB_COUNT_X,SB_BOMB_COUNT_Y,gr_find_closest_color(5,5,5),0);
} }