From 4e7871fefae927c08c4db46f19a22ff5c9671242 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 21 Nov 2010 16:31:16 +0100 Subject: [PATCH] If panel_bg is 0 avoid to waste time getting useless data Not adding a similar check for alpha as it cannot be set to 0 in menu --- hud_nexuiz.cfg | 4 ++-- qcsrc/client/hud.qh | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index bdd7a97f2..8345b5b2d 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -89,10 +89,10 @@ seta hud_panel_healtharmor_progressbar "0" seta hud_panel_notify 0 seta hud_panel_notify_pos "0 0.650000" seta hud_panel_notify_size "0.300000 0.070000" -seta hud_panel_notify_bg "" +seta hud_panel_notify_bg "0" seta hud_panel_notify_bg_color "" seta hud_panel_notify_bg_color_team "" -seta hud_panel_notify_bg_alpha "0" +seta hud_panel_notify_bg_alpha "" seta hud_panel_notify_bg_border "" seta hud_panel_notify_bg_padding "" seta hud_panel_notify_flip "0" diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index b4d1a20d3..11b968e38 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -206,13 +206,15 @@ if(panel_bg_padding_str == "") {\ 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()\ +#define HUD_Panel_GetStringVars()\ HUD_Panel_GetBg()\ -HUD_Panel_GetColorTeam()\ -HUD_Panel_GetColor()\ -HUD_Panel_GetBgAlpha()\ +if (panel_bg != "0") {\ + HUD_Panel_GetColorTeam()\ + HUD_Panel_GetColor()\ + HUD_Panel_GetBgAlpha()\ + HUD_Panel_GetBorder()\ +}\ HUD_Panel_GetFgAlpha()\ -HUD_Panel_GetBorder()\ HUD_Panel_GetScaledVectors()\ HUD_Panel_GetPadding() @@ -261,7 +263,7 @@ panel_bg_color_team_str = cvar_string("hud_panel_" #name "_bg_color_team"); \ panel_bg_alpha_str = cvar_string("hud_panel_" #name "_bg_alpha"); \ panel_bg_border_str = cvar_string("hud_panel_" #name "_bg_border"); \ panel_bg_padding_str = cvar_string("hud_panel_" #name "_bg_padding"); \ -HUD_Panel_StringVars()\ +HUD_Panel_GetStringVars()\ if(menu_enabled == 2 && active_panel == highlightedPanel) {\ HUD_Panel_GetMenuSize()\ HUD_Panel_GetMenuPos()\ -- 2.39.2