From 6528ba027e5b03b1fae9912850a4964f7bad7bb6 Mon Sep 17 00:00:00 2001 From: terencehill Date: Thu, 15 Sep 2011 23:39:24 +0200 Subject: [PATCH] Draw the maximized radar on top --- qcsrc/client/hud.qc | 22 +++++++++++++++------- qcsrc/client/hud.qh | 1 + 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 6b5ec6c17..e273e0dc2 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2302,7 +2302,11 @@ void HUD_Radar(void) { if (!autocvar__hud_configure) { - if (!autocvar_hud_panel_radar_maximized) + if (autocvar_hud_panel_radar_maximized) + { + if (!hud_draw_maximized) return; + } + else { if (autocvar_hud_panel_radar == 0) return; if (autocvar_hud_panel_radar != 2 && !teamplay) return; @@ -3831,6 +3835,8 @@ void HUD_Chat(void) cvar_set("con_chatrect", "0"); return; } + if(autocvar__con_chat_maximized) + if(!hud_draw_maximized) return; } else hud_configure_active_panel = HUD_PANEL_CHAT; @@ -4856,15 +4862,17 @@ void HUD_Main (void) } } + hud_draw_maximized = 0; // draw panels in order specified by panel_order array - for(i = HUD_PANEL_NUM - 1; i >= 0; --i) { - if(i != HUD_PANEL_CHAT || !autocvar__con_chat_maximized) // don't draw maximized chat panel twice! - HUD_DrawPanel(panel_order[i]); - } + for(i = HUD_PANEL_NUM - 1; i >= 0; --i) + HUD_DrawPanel(panel_order[i]); - // draw chat panel on top if it is maximized + hud_draw_maximized = 1; // panels that may be maximized must check this var + // draw maximized panels on top + if(autocvar_hud_panel_radar_maximized) + HUD_Radar(); if(autocvar__con_chat_maximized) - HUD_Chat(); // HUD_DrawPanel(HUD_PANEL_CHAT); + HUD_Chat(); if(autocvar__hud_configure && tab_panel != -1) { diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index 120db4d0c..b1b54f519 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -2,6 +2,7 @@ float log(float f); float panel_order[HUD_PANEL_NUM]; string hud_panelorder_prev; +float hud_draw_maximized; vector mousepos; vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click) -- 2.39.2