From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 30 Jun 2010 22:27:40 +0000 (+0300)
Subject: now REALLY get past the macro call :) :)
X-Git-Tag: xonotic-v0.1.0preview~457^2~47
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bee3c642bce9e1ac711b0ac0a89596a185aa4522;p=xonotic%2Fxonotic-data.pk3dir.git

now REALLY get past the macro call :) :)
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 12abff219..127c42892 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1511,7 +1511,6 @@ void HUD_WeaponIcons(void)
 	}
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -1749,7 +1748,6 @@ void HUD_Inventory(void)
 	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -1864,7 +1862,6 @@ void HUD_Powerups(void) {
 	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -2046,7 +2043,6 @@ void HUD_HealthArmor(void)
 	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -2770,7 +2766,6 @@ void HUD_Notify (void)
 	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -3182,7 +3177,6 @@ void HUD_Timer(void)
 	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -3235,7 +3229,6 @@ void HUD_Radar(void)
 	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -3361,7 +3354,6 @@ void HUD_Score(void)
 	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -3512,7 +3504,6 @@ void HUD_RaceTimer (void) {
 	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -3698,7 +3689,6 @@ void HUD_VoteWindow(void)
 	a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
 
 	HUD_Panel_DrawBg(id, pos, mySize, a);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -4267,7 +4257,6 @@ void HUD_ModIcons(void)
 	if(mod_alpha)
 		HUD_Panel_DrawBg(id, pos, mySize, mod_alpha);
 
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -4296,7 +4285,6 @@ void HUD_DrawPressedKeys(void)
 	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -4327,7 +4315,6 @@ void HUD_Chat(void)
 	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -4377,7 +4364,6 @@ void HUD_EngineInfo(void)
 	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	padding = panel_bg_padding;
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 0a9f2e046..8a10a5be0 100644
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -128,7 +128,7 @@ if(autocvar__hud_configure && disable_menu_alphacheck == 2 && highlightedPanel =
 	panel_bg_alpha = max(autocvar_hud_configure_bg_minalpha, panel_bg_alpha);\
 } if(autocvar__hud_configure && !panel_enabled) {\
 	panel_bg_alpha = 0.25;\
-} if(!(disable_menu_alphacheck == 2 && highlightedPanel == id)) {\
+} if(!(disable_menu_alphacheck == 2 && highlightedPanel == active_panel)) {\
 	panel_bg_alpha *= menu_fade_alpha;\
 }
 
@@ -145,7 +145,7 @@ if(panel_bg_padding_str == "") {\
 } else {\
 	panel_bg_padding = stof(panel_bg_padding_str);\
 }\
-panel_bg_padding = min(min(mySize_x, mySize_y)/2 - 5, panel_bg_padding);
+panel_bg_padding = min(min(panel_size_x, panel_size_y)/2 - 5, panel_bg_padding);
 
 // Point to the macros above (stupid max macro length)
 #define HUD_Panel_StringVars()\