-#define HUD_Panel_UpdateCvars() \
-if(panel.update_time <= time) { \
- if(autocvar__hud_configure) panel_enabled = cvar(strcat("hud_panel_", panel.panel_name)); \
- panel_pos = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_pos"))); \
- panel_size = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_size"))); \
- HUD_Panel_ScalePosSize() \
- panel_bg_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg")); \
- panel_bg_color_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_color")); \
- panel_bg_color_team_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_color_team")); \
- panel_bg_alpha_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_alpha")); \
- panel_bg_border_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_border")); \
- panel_bg_padding_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_padding")); \
- HUD_Panel_GetBg()\
- if (panel.current_panel_bg != "0") {\
- HUD_Panel_GetColorTeam()\
- HUD_Panel_GetColor()\
- HUD_Panel_GetBgAlpha()\
- HUD_Panel_GetBorder()\
- }\
- HUD_Panel_GetFgAlpha()\
- HUD_Panel_GetPadding()\
- panel.current_panel_bg_alpha = panel_bg_alpha; \
- panel.current_panel_fg_alpha = panel_fg_alpha; \
- if(menu_enabled == 2 && panel == highlightedPanel) {\
- HUD_Panel_UpdatePosSize_ForMenu()\
- } else {\
- panel_bg_alpha *= hud_fade_alpha;\
- panel_fg_alpha *= hud_fade_alpha;\
- }\
- panel.current_panel_pos = panel_pos; \
- panel.current_panel_size = panel_size; \
- panel.current_panel_bg_border = panel_bg_border; \
- panel.current_panel_bg_color = panel_bg_color; \
- panel.current_panel_bg_color_team = panel_bg_color_team; \
- panel.current_panel_bg_padding = panel_bg_padding; \
- panel.update_time = (autocvar__hud_configure) ? time : time + autocvar_hud_panel_update_interval; \
-} else { \
- panel_pos = panel.current_panel_pos; \
- panel_size = panel.current_panel_size; \
- panel_bg_alpha = panel.current_panel_bg_alpha * hud_fade_alpha; \
- panel_bg_border = panel.current_panel_bg_border; \
- panel_bg_color = panel.current_panel_bg_color; \
- panel_bg_color_team = panel.current_panel_bg_color_team; \
- panel_bg_padding = panel.current_panel_bg_padding; \
- panel_fg_alpha = panel.current_panel_fg_alpha * hud_fade_alpha; \
-} ENDS_WITH_CURLY_BRACE
-
-#define HUD_Panel_UpdatePosSize() {\
-panel_enabled = cvar(strcat("hud_panel_", panel.panel_name)); \
-panel_pos = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_pos"))); \
-panel_size = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_size"))); \
-HUD_Panel_ScalePosSize()\
-if(menu_enabled == 2 && panel == highlightedPanel) {\
- HUD_Panel_UpdatePosSize_ForMenu()\
-}\
-panel_bg_border_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_border")); \
-HUD_Panel_GetBorder() \
-} ENDS_WITH_CURLY_BRACE
-
-#define NOTIFY_MAX_ENTRIES 10
-#define NOTIFY_ICON_MARGIN 0.02
-
-float notify_index;
-float notify_count;
+#define HUD_Panel_UpdateCvars() do { \
+ if (panel.update_time <= time) { \
+ if (autocvar__hud_configure) panel_enabled = cvar(strcat("hud_panel_", panel.panel_name)); \
+ panel_pos = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_pos"))); \
+ panel_size = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_size"))); \
+ HUD_Panel_ScalePosSize(); \
+ panel_bg_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg")); \
+ panel_bg_color_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_color")); \
+ panel_bg_color_team_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_color_team")); \
+ panel_bg_alpha_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_alpha")); \
+ panel_bg_border_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_border")); \
+ panel_bg_padding_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_padding")); \
+ HUD_Panel_GetBg(); \
+ if (panel.current_panel_bg != "0") { \
+ HUD_Panel_GetColorTeam(); \
+ HUD_Panel_GetColor(); \
+ HUD_Panel_GetBgAlpha(); \
+ HUD_Panel_GetBorder(); \
+ } \
+ HUD_Panel_GetFgAlpha(); \
+ HUD_Panel_GetPadding(); \
+ panel.current_panel_bg_alpha = panel_bg_alpha; \
+ panel.current_panel_fg_alpha = panel_fg_alpha; \
+ if (menu_enabled == 2 && panel == highlightedPanel) { \
+ HUD_Panel_UpdatePosSize_ForMenu(); \
+ } else { \
+ panel_bg_alpha *= hud_fade_alpha; \
+ panel_fg_alpha *= hud_fade_alpha; \
+ } \
+ panel.current_panel_pos = panel_pos; \
+ panel.current_panel_size = panel_size; \
+ panel.current_panel_bg_border = panel_bg_border; \
+ panel.current_panel_bg_color = panel_bg_color; \
+ panel.current_panel_bg_color_team = panel_bg_color_team; \
+ panel.current_panel_bg_padding = panel_bg_padding; \
+ panel.update_time = (autocvar__hud_configure) ? time : time + autocvar_hud_panel_update_interval; \
+ } else { \
+ panel_pos = panel.current_panel_pos; \
+ panel_size = panel.current_panel_size; \
+ panel_bg_alpha = panel.current_panel_bg_alpha * hud_fade_alpha; \
+ panel_bg_border = panel.current_panel_bg_border; \
+ panel_bg_color = panel.current_panel_bg_color; \
+ panel_bg_color_team = panel.current_panel_bg_color_team; \
+ panel_bg_padding = panel.current_panel_bg_padding; \
+ panel_fg_alpha = panel.current_panel_fg_alpha * hud_fade_alpha; \
+ } \
+} while(0)
+
+#define HUD_Panel_UpdatePosSize() do { \
+ panel_enabled = cvar(strcat("hud_panel_", panel.panel_name)); \
+ panel_pos = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_pos"))); \
+ panel_size = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_size"))); \
+ HUD_Panel_ScalePosSize(); \
+ if (menu_enabled == 2 && panel == highlightedPanel) { \
+ HUD_Panel_UpdatePosSize_ForMenu(); \
+ } \
+ panel_bg_border_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_border")); \
+ HUD_Panel_GetBorder(); \
+} while(0)
+
+const int NOTIFY_MAX_ENTRIES = 10;
+const float NOTIFY_ICON_MARGIN = 0.02;
+
+int notify_index;
+int notify_count;