little reorganization for draw_hud(): draw multiplayer names first, reticle last to prevent anything being drawn over by floating names and reticle not messed by anything else
This commit is contained in:
parent
20e8b6c497
commit
e23535ffe8
|
@ -1,5 +1,9 @@
|
|||
D1X-Rebirth Changelog
|
||||
|
||||
20120424
|
||||
--------
|
||||
main/gauges.c: little reorganization for draw_hud(): draw multiplayer names first, reticle last to prevent anything being drawn over by floating names and reticle not messed by anything else
|
||||
|
||||
20120423
|
||||
--------
|
||||
main/multi.c, main/multi.h, main/net_udp.c: fixed improper player disconnecting which might have been caused by endlevel packet
|
||||
|
|
|
@ -2403,7 +2403,10 @@ void draw_hud()
|
|||
hud_show_timer_count();
|
||||
|
||||
// Show other stuff if not in rearview or letterbox.
|
||||
if (!Rear_view && PlayerCfg.CockpitMode[1]!=CM_REAR_VIEW) {
|
||||
if (!Rear_view && PlayerCfg.CockpitMode[1]!=CM_REAR_VIEW)
|
||||
{
|
||||
show_HUD_names();
|
||||
|
||||
if (PlayerCfg.CockpitMode[1]==CM_STATUS_BAR || PlayerCfg.CockpitMode[1]==CM_FULL_SCREEN)
|
||||
hud_show_homing_warning();
|
||||
|
||||
|
@ -2419,27 +2422,20 @@ void draw_hud()
|
|||
newdemo_record_player_flags(Players[Player_num].flags);
|
||||
}
|
||||
|
||||
#ifdef NETWORK
|
||||
#ifndef RELEASE
|
||||
if (!(Game_mode&GM_MULTI && Show_kill_list))
|
||||
show_time();
|
||||
#endif
|
||||
#endif
|
||||
if (PlayerCfg.CockpitMode[1] != CM_LETTERBOX)
|
||||
show_reticle(PlayerCfg.ReticleType, 1);
|
||||
if (PlayerCfg.CockpitMode[1] != CM_LETTERBOX && Newdemo_state != ND_STATE_PLAYBACK && PlayerCfg.MouseFlightSim && PlayerCfg.MouseFSIndicator)
|
||||
show_mousefs_indicator(Controls.raw_mouse_axis[0], Controls.raw_mouse_axis[1], Controls.raw_mouse_axis[2], GWIDTH/2, GHEIGHT/2, GHEIGHT/4);
|
||||
|
||||
show_HUD_names();
|
||||
|
||||
HUD_render_message_frame();
|
||||
|
||||
if (PlayerCfg.CockpitMode[1]!=CM_STATUS_BAR)
|
||||
hud_show_lives();
|
||||
#ifdef NETWORK
|
||||
if (Game_mode&GM_MULTI && Show_kill_list)
|
||||
hud_show_kill_list();
|
||||
#endif
|
||||
if (PlayerCfg.CockpitMode[1] != CM_LETTERBOX)
|
||||
show_reticle(PlayerCfg.ReticleType, 1);
|
||||
if (PlayerCfg.CockpitMode[1] != CM_LETTERBOX && Newdemo_state != ND_STATE_PLAYBACK && PlayerCfg.MouseFlightSim && PlayerCfg.MouseFSIndicator)
|
||||
show_mousefs_indicator(Controls.raw_mouse_axis[0], Controls.raw_mouse_axis[1], Controls.raw_mouse_axis[2], GWIDTH/2, GHEIGHT/2, GHEIGHT/4);
|
||||
}
|
||||
|
||||
if (Rear_view && PlayerCfg.CockpitMode[1]!=CM_REAR_VIEW) {
|
||||
|
|
Loading…
Reference in a new issue