From: terencehill <piuntn@gmail.com>
Date: Thu, 30 May 2013 18:00:18 +0000 (+0200)
Subject: Reduce scope of panel_bg
X-Git-Tag: xonotic-v0.8.0~226^2~1^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e25f31d58eca9fafdbcf1798bb2108e714d6c29;p=xonotic%2Fxonotic-data.pk3dir.git

Reduce scope of panel_bg
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index f43d9501d..3d079bc8a 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1840,6 +1840,7 @@ void HUD_Radar(void)
 		panel_pos_x = (vid_conwidth - panel_size_x) / 2;
 		panel_pos_y = (vid_conheight - panel_size_y) / 2;
 
+		string panel_bg;
 		panel_bg = strcat(hud_skin_path, "/border_default"); // always use the default border when maximized
 		if(precache_pic(panel_bg) == "")
 			panel_bg = "gfx/hud/default/border_default"; // fallback
@@ -3462,6 +3463,7 @@ void HUD_Chat(void)
 		panel_size_y = vid_conheight - panel_bg_border * 2;
 		if(panel.current_panel_bg == "0") // force a border when maximized
 		{
+			string panel_bg;
 			panel_bg = strcat(hud_skin_path, "/border_default");
 			if(precache_pic(panel_bg) == "")
 				panel_bg = "gfx/hud/default/border_default";
diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 1df77cde1..1c6908a7b 100644
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -77,7 +77,6 @@ entity panel;
 var float panel_enabled;
 var vector panel_pos;
 var vector panel_size;
-var string panel_bg; // exceptionally this a temporary var, panel.current_panel_bg keeps the real value
 var string panel_bg_str; // "_str" vars contain the raw value of the cvar, non-"_str" contains what hud.qc code should use
 var vector panel_bg_color;
 var string panel_bg_color_str;
@@ -146,6 +145,7 @@ HUD_PANELS
 // Get value for panel.current_panel_bg: if "" fetch default, else use panel_bg_str
 // comment on last line of macro: // we probably want to see a background in config mode at all times...
 #define HUD_Panel_GetBg()\
+string panel_bg;\
 if(!autocvar__hud_configure && panel_bg_str == "0") {\
 	panel_bg = "0";\
 } else {\