Merge branch 'master' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / hud.qh

diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh
index c710fd6518f90205c2c16e6258cb1a818777ca74..b4596fbdfe8984e5cd2f15b70843a6070922049d 100644 (file)
--- a/qcsrc/client/hud/hud.qh
+++ b/qcsrc/client/hud/hud.qh
@@ -27,7 +27,7 @@ REGISTER_REGISTRY(hud_panels)
 #define HUD_PANEL(NAME) HUD_PANEL_##NAME
 
 // draw the background/borders
-#define HUD_Panel_DrawBg() MACRO_BEGIN { \
+#define HUD_Panel_DrawBg() MACRO_BEGIN \
        if(panel.current_panel_bg != "0" && panel.current_panel_bg != "") \
                draw_BorderPicture( \
                        HUD_Shift(panel_pos - '1 1 0' * panel_bg_border), \
@@ -36,7 +36,7 @@ REGISTER_REGISTRY(hud_panels)
                        panel_bg_color, panel_bg_alpha, \
                        HUD_Scale('1 1 0' * BORDER_MULTIPLIER * panel_bg_border) \
                ); \
-} MACRO_END
+MACRO_END
 
 int panel_order[hud_panels_MAX];
 string hud_panelorder_prev;
@@ -240,7 +240,7 @@ REGISTER_HUD_PANEL(SCOREBOARD,      Scoreboard_Draw,    PANEL_CONFIG_NO
 
 // 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() MACRO_BEGIN { \
+#define HUD_Panel_GetBg() MACRO_BEGIN \
        string panel_bg; \
        if (!autocvar__hud_configure && panel_bg_str == "0") { \
                panel_bg = "0"; \
@@ -263,10 +263,10 @@ REGISTER_HUD_PANEL(SCOREBOARD,      Scoreboard_Draw,    PANEL_CONFIG_NO
                } \
        } \
        strcpy(panel.current_panel_bg, panel_bg); \
-} MACRO_END
+MACRO_END
 
 // Get value for panel_bg_color: if "" fetch default, else use panel_bg_color. Convert pants, shirt or teamcolor into a vector.
-#define HUD_Panel_GetColor() MACRO_BEGIN { \
+#define HUD_Panel_GetColor() MACRO_BEGIN \
        if ((teamplay) && panel_bg_color_team > 0) { \
                if (autocvar__hud_configure && myteam == NUM_SPECTATOR) \
                        panel_bg_color = '1 0 0' * panel_bg_color_team; \
@@ -287,20 +287,20 @@ REGISTER_HUD_PANEL(SCOREBOARD,      Scoreboard_Draw,    PANEL_CONFIG_NO
                        } \
                } \
        } \
-} MACRO_END
+MACRO_END
 
 // Get value for panel_bg_color_team: if "" fetch default, else use panel_bg_color_team_str
-#define HUD_Panel_GetColorTeam() MACRO_BEGIN { \
+#define HUD_Panel_GetColorTeam() MACRO_BEGIN \
        if (panel_bg_color_team_str == "") { \
                panel_bg_color_team = autocvar_hud_panel_bg_color_team; \
        } else { \
                panel_bg_color_team = stof(panel_bg_color_team_str); \
        } \
-} MACRO_END
+MACRO_END
 
 // Get value for panel_bg_alpha: if "" fetch default, else use panel_bg_alpha. Also do various menu dialog fadeout/in checks, and minalpha checks
 // comment on line 3 of macro: // do not set a minalpha cap when showing the config dialog for this panel
-#define HUD_Panel_GetBgAlpha() MACRO_BEGIN { \
+#define HUD_Panel_GetBgAlpha() MACRO_BEGIN \
        if (panel_bg_alpha_str == "") { \
                panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha); \
        } \
@@ -313,39 +313,39 @@ REGISTER_HUD_PANEL(SCOREBOARD,      Scoreboard_Draw,    PANEL_CONFIG_NO
                else \
                        panel_bg_alpha = max(cvar("hud_configure_bg_minalpha"), panel_bg_alpha); \
        } \
-} MACRO_END
+MACRO_END
 
 // Get value for panel_fg_alpha. Also do various minalpha checks
 // comment on line 2 of macro: // ALWAYS show disabled panels at 0.25 alpha when in config mode
-#define HUD_Panel_GetFgAlpha() MACRO_BEGIN { \
+#define HUD_Panel_GetFgAlpha() MACRO_BEGIN \
        panel_fg_alpha = autocvar_hud_panel_fg_alpha; \
        if (autocvar__hud_configure && !panel_enabled) \
                panel_fg_alpha = 0.25; \
-} MACRO_END
+MACRO_END
 
 // Get border. See comments above, it's similar.
-#define HUD_Panel_GetBorder() MACRO_BEGIN { \
+#define HUD_Panel_GetBorder() MACRO_BEGIN \
        if (panel_bg_border_str == "") { \
                panel_bg_border = autocvar_hud_panel_bg_border; \
        } else { \
                panel_bg_border = stof(panel_bg_border_str); \
        } \
-} MACRO_END
+MACRO_END
 
 // Get padding. See comments above, it's similar.
 // last line is a port of the old function, basically always make sure the panel contents are at least 5 pixels tall/wide, to disallow extreme padding values
-#define HUD_Panel_GetPadding() MACRO_BEGIN { \
+#define HUD_Panel_GetPadding() MACRO_BEGIN \
        if (panel_bg_padding_str == "") { \
                panel_bg_padding = autocvar_hud_panel_bg_padding; \
        } else { \
                panel_bg_padding = stof(panel_bg_padding_str); \
        } \
        panel_bg_padding = min(min(panel_size.x, panel_size.y)/2 - 5, panel_bg_padding); \
-} MACRO_END
+MACRO_END
 
 // return smoothly faded pos and size of given panel when a dialog is active
 // don't center too wide panels, it doesn't work with different resolutions
-#define HUD_Panel_UpdatePosSize_ForMenu() MACRO_BEGIN { \
+#define HUD_Panel_UpdatePosSize_ForMenu() MACRO_BEGIN \
        vector new_size = panel_size; \
        float max_panel_width = 0.52 * vid_conwidth; \
        if(panel_size.x > max_panel_width) \
@@ -356,13 +356,13 @@ REGISTER_HUD_PANEL(SCOREBOARD,      Scoreboard_Draw,    PANEL_CONFIG_NO
        vector new_pos = vec2(panel_bg_border + 0.5 * max_panel_width, 0.5 * vid_conheight) - 0.5 * new_size; \
        panel_pos = (1 - autocvar__menu_alpha) * panel_pos + (autocvar__menu_alpha) * new_pos; \
        panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * new_size; \
-} MACRO_END
+MACRO_END
 
 // Scale the pos and size vectors to absolute coordinates
-#define HUD_Panel_ScalePosSize() MACRO_BEGIN { \
+#define HUD_Panel_ScalePosSize() MACRO_BEGIN \
        panel_pos.x *= vid_conwidth; panel_pos.y *= vid_conheight; \
        panel_size.x *= vid_conwidth; panel_size.y *= vid_conheight; \
-} MACRO_END
+MACRO_END
 
 float panel_fade_alpha;
 void HUD_Panel_LoadCvars();
@@ -371,7 +371,7 @@ void HUD_Panel_LoadCvars();
        panel_enabled = ((panel.panel_configflags & PANEL_CONFIG_CANBEOFF) \
                                        ? cvar(strcat("hud_panel_", panel.panel_name)) : true)
 
-#define HUD_Panel_UpdatePosSize() MACRO_BEGIN { \
+#define HUD_Panel_UpdatePosSize() MACRO_BEGIN \
        Hud_Panel_GetPanelEnabled(); \
        panel_pos = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_pos"))); \
        panel_size = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_size"))); \
@@ -381,7 +381,7 @@ void HUD_Panel_LoadCvars();
        } \
        panel_bg_border_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_border")); \
        HUD_Panel_GetBorder(); \
-} MACRO_END
+MACRO_END
 
 const int NOTIFY_MAX_ENTRIES = 10;
 const float NOTIFY_ICON_MARGIN = 0.02;