Moved show_bomb_count() to work with new transparency cockpit layer; Fixed nm_draw_background() for scores and show_game_rules()
This commit is contained in:
parent
13631bd2c6
commit
b371d65a19
|
@ -1,5 +1,9 @@
|
|||
D2X-Rebirth Changelog
|
||||
|
||||
20071009
|
||||
--------
|
||||
main/gauges.c, main/network.c, main/scores.c: Moved show_bomb_count() to work with new transparency cockpit layer; Fixed nm_draw_background() for scores and show_game_rules()
|
||||
|
||||
20071008
|
||||
--------
|
||||
main/game.c, main/gamerend.c, main/inferno.c, main/object.c, main/playsave.c: Improvements for Cockpit mode save; Fixed -pilot switch
|
||||
|
|
|
@ -2384,13 +2384,6 @@ void draw_weapon_boxes()
|
|||
}
|
||||
else if (weapon_box_user[1] == WBU_STATIC)
|
||||
draw_static(1);
|
||||
|
||||
if (Cockpit_mode == CM_STATUS_BAR) {
|
||||
if (!GameArg.GfxGaugeHudMode && weapon_box_user[1] == WBU_WEAPON)
|
||||
show_bomb_count(HUD_SCALE_X(SB_BOMB_COUNT_X), HUD_SCALE_Y(SB_BOMB_COUNT_Y), gr_find_closest_color(0, 0, 0), 0);
|
||||
} else {
|
||||
show_bomb_count(HUD_SCALE_X(BOMB_COUNT_X), HUD_SCALE_Y(BOMB_COUNT_Y), gr_find_closest_color(0, 0, 0), 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -3035,6 +3028,7 @@ void render_gauges()
|
|||
}
|
||||
draw_energy_bar(energy);
|
||||
draw_numerical_display(shields, energy);
|
||||
show_bomb_count(HUD_SCALE_X(BOMB_COUNT_X), HUD_SCALE_Y(BOMB_COUNT_Y), gr_find_closest_color(0, 0, 0), 0);
|
||||
|
||||
if (Newdemo_state == ND_STATE_RECORDING && (Afterburner_charge != old_afterburner))
|
||||
{
|
||||
|
@ -3075,6 +3069,8 @@ void render_gauges()
|
|||
old_energy = energy;
|
||||
}
|
||||
sb_draw_energy_bar(energy);
|
||||
if (!GameArg.GfxGaugeHudMode && weapon_box_user[1] == WBU_WEAPON)
|
||||
show_bomb_count(HUD_SCALE_X(SB_BOMB_COUNT_X), HUD_SCALE_Y(SB_BOMB_COUNT_Y), gr_find_closest_color(0, 0, 0), 0);
|
||||
|
||||
if (Newdemo_state == ND_STATE_RECORDING && (Afterburner_charge != old_afterburner))
|
||||
{
|
||||
|
|
|
@ -6378,7 +6378,10 @@ void show_game_rules(netgame_info game)
|
|||
gr_flip();
|
||||
nm_draw_background1(NULL);
|
||||
#endif
|
||||
nm_draw_background((SWIDTH/2)-(w/2)-15*(SWIDTH/320), (SHEIGHT/2)-(h/2)-15*(SHEIGHT/200), (SWIDTH/2)+(w/2)+15*(SWIDTH/320), (SHEIGHT/2)+(h/2)+15*(SHEIGHT/200));
|
||||
if (HiresGFX)
|
||||
nm_draw_background((SWIDTH/2)-(w/2)-30*(SWIDTH/640), (SHEIGHT/2)-(h/2)-30*(SHEIGHT/480), (SWIDTH/2)+(w/2)+30*(SWIDTH/640), (SHEIGHT/2)+(h/2)+30*(SHEIGHT/480));
|
||||
else
|
||||
nm_draw_background((SWIDTH/2)-(w/2)-15*(SWIDTH/320), (SHEIGHT/2)-(h/2)-15*(SHEIGHT/200), (SWIDTH/2)+(w/2)+15*(SWIDTH/320), (SHEIGHT/2)+(h/2)+15*(SHEIGHT/200));
|
||||
|
||||
gr_set_current_canvas(&canvas);
|
||||
|
||||
|
|
|
@ -389,7 +389,10 @@ ReshowScores:
|
|||
gr_flip();
|
||||
nm_draw_background1(NULL);
|
||||
#endif
|
||||
nm_draw_background((SWIDTH/2)-(w/2)-15*(SWIDTH/320), (SHEIGHT/2)-(h/2)-15*(SHEIGHT/200), (SWIDTH/2)+(w/2)+15*(SWIDTH/320), (SHEIGHT/2)+(h/2)+15*(SHEIGHT/200));
|
||||
if (HiresGFX)
|
||||
nm_draw_background((SWIDTH/2)-(w/2)-30*(SWIDTH/640), (SHEIGHT/2)-(h/2)-30*(SHEIGHT/480), (SWIDTH/2)+(w/2)+30*(SWIDTH/640), (SHEIGHT/2)+(h/2)+30*(SHEIGHT/480));
|
||||
else
|
||||
nm_draw_background((SWIDTH/2)-(w/2)-15*(SWIDTH/320), (SHEIGHT/2)-(h/2)-15*(SHEIGHT/200), (SWIDTH/2)+(w/2)+15*(SWIDTH/320), (SHEIGHT/2)+(h/2)+15*(SHEIGHT/200));
|
||||
|
||||
gr_set_current_canvas(&canvas);
|
||||
|
||||
|
|
Loading…
Reference in a new issue