From: terencehill <piuntn@gmail.com>
Date: Mon, 3 Oct 2011 19:38:06 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/maximized_radar
X-Git-Tag: xonotic-v0.6.0~40^2~41^2^2~5
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=88296a0f82b51a5b98d15f7be8032cdf584eec99

Merge branch 'master' into terencehill/maximized_radar
---

88296a0f82b51a5b98d15f7be8032cdf584eec99
diff --cc qcsrc/client/hud.qc
index e273e0dc2,3d3fe93cc..05b42ed36
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -4862,22 -4872,28 +4900,30 @@@ 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)
+ 	if(autocvar__hud_configure)
  	{
- 		HUD_Panel_UpdatePosSizeForId(tab_panel)
- 		drawfill(panel_pos - '1 1 0' * panel_bg_border, panel_size + '2 2 0' * panel_bg_border, '1 1 1', .2, DRAWFLAG_NORMAL);
+ 		if(tab_panel != -1)
+ 		{
+ 			HUD_Panel_UpdatePosSizeForId(tab_panel)
+ 			drawfill(panel_pos - '1 1 0' * panel_bg_border, panel_size + '2 2 0' * panel_bg_border, '1 1 1', .2, DRAWFLAG_NORMAL);
+ 		}
+ 		if(highlightedPanel != -1)
+ 		{
+ 			HUD_Panel_UpdatePosSizeForId(highlightedPanel);
+ 			HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha));
+ 		}
  	}
  
  	hud_configure_prev = autocvar__hud_configure;