< FruitieX> OMFG < FruitieX> IT COMPILES < FruitieX> 268 warnings < FruitieX> I serio...

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

diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 94409addbcbe219e6ab38692e326ab62374931f1..2e55fa164a353d0abfb4bbb5e3dfc991a3e2e1db 100644 (file)
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -74,31 +74,11 @@ var float panel_accuracy_alreadyvoted_alpha;
 // ----------------------
 // Little help for the poor people who have to make sense of this: Start from the bottom
 
-// we probably want to get rid of GetName in the most places in hud.qc, TODO!
-// Get name of specified panel id
-#define HUD_Panel_GetName(id) \
-switch(id) { \
-       case HUD_PANEL_WEAPONICONS: panel_name = HUD_PANELNAME_WEAPONICONS; break; \
-       case HUD_PANEL_INVENTORY: panel_name = HUD_PANELNAME_INVENTORY; break; \
-       case HUD_PANEL_POWERUPS: panel_name = HUD_PANELNAME_POWERUPS; break; \
-       case HUD_PANEL_HEALTHARMOR: panel_name = HUD_PANELNAME_HEALTHARMOR; break; \
-       case HUD_PANEL_NOTIFY: panel_name = HUD_PANELNAME_NOTIFY; break; \
-       case HUD_PANEL_TIMER: panel_name = HUD_PANELNAME_TIMER; break; \
-       case HUD_PANEL_RADAR: panel_name = HUD_PANELNAME_RADAR; break; \
-       case HUD_PANEL_SCORE: panel_name = HUD_PANELNAME_SCORE; break; \
-       case HUD_PANEL_RACETIMER: panel_name = HUD_PANELNAME_RACETIMER; break; \
-       case HUD_PANEL_VOTE: panel_name = HUD_PANELNAME_VOTE; break; \
-       case HUD_PANEL_MODICONS: panel_name = HUD_PANELNAME_MODICONS; break; \
-       case HUD_PANEL_PRESSEDKEYS: panel_name = HUD_PANELNAME_PRESSEDKEYS; break; \
-       case HUD_PANEL_CHAT: panel_name = HUD_PANELNAME_CHAT; break; \
-       case HUD_PANEL_ENGINEINFO: panel_name = HUD_PANELNAME_ENGINEINFO; break; \
-}
-
 // Get value for 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()\
 if(!autocvar__hud_configure && panel_bg_str == "0") {\
-       panel_bg = 0;\
+       panel_bg = "0";\
 } else {\
        if(panel_bg_str == "") {\
                panel_bg = autocvar_hud_bg;\
@@ -109,50 +89,55 @@ if(!autocvar__hud_configure && panel_bg_str == "0") {\
 
 // Get value for panel_bg_color_team: if "" fetch default, else use panel_bg_color_team_str
 #define HUD_Panel_GetColorTeam()\
-if(panel_bg_color_team_str == "")\
+if(panel_bg_color_team_str == "") {\
        panel_bg_color_team = autocvar_hud_bg_color_team;\
-else\
-       panel_bg_color_team = stof(panel_bg_color_team_str);
+} else {\
+       panel_bg_color_team = stof(panel_bg_color_team_str);\
+}
 
 // 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()\
-if(panel_bg_alpha_str == "")\
-       panel_bg_alpha_str = autocvar_hud_bg_alpha;\
+if(panel_bg_alpha_str == "") {\
+       panel_bg_alpha_str = ftos(autocvar_hud_bg_alpha);\
+}\
 panel_bg_alpha = stof(panel_bg_alpha_str);\
-if(autocvar__hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == active_panel)\
-       panel_bg_alpha = (1 - autocvar__menu_alpha) * max(autocvar_hud_configure_bg_minalpha, panel_bg_alpha) + autocvar__menu_alpha) * panel_bg_alpha;\
-else if(autocvar__hud_configure)\
+if(autocvar__hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == active_panel) {\
+       panel_bg_alpha = (1 - autocvar__menu_alpha) * max(autocvar_hud_configure_bg_minalpha, panel_bg_alpha) + autocvar__menu_alpha * panel_bg_alpha;\
+} else if(autocvar__hud_configure) {\
        panel_bg_alpha = max(autocvar_hud_configure_bg_minalpha, panel_bg_alpha);\
-if(autocvar__hud_configure && !panel_enabled)\
+} 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;\
+}
 
 #define HUD_Panel_GetBorder()\
-if(panel_bg_border_str == "")\
+if(panel_bg_border_str == "") {\
        panel_bg_border = autocvar_hud_bg_border;\
-else\
-       panel_bg_border = stof(panel_bg_border_str);
+} else {\
+       panel_bg_border = stof(panel_bg_border_str);\
+}
 
 #define HUD_Panel_GetPadding()\
-if(panel_bg_border_padding == "")\
+if(panel_bg_padding_str == "") {\
        panel_bg_padding = autocvar_hud_bg_padding;\
-else\
+} 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()\
-HUD_Panel_GetBg \
-HUD_Panel_GetColorTeam \
-HUD_Panel_GetBgAlpha \
-HUD_Panel_GetBorder \
-HUD_Panel_GetPadding
+HUD_Panel_GetBg()\
+HUD_Panel_GetColorTeam()\
+HUD_Panel_GetBgAlpha()\
+HUD_Panel_GetBorder()\
+HUD_Panel_GetPadding()
 
 // Update all common cvars of given panel name
 #define HUD_Panel_UpdateCvars(name) \
-panel_enabled = autocvar_hud_##name##; \
+panel_enabled = autocvar_hud_##name; \
 panel_pos = autocvar_hud_##name##_pos; \
 panel_size = autocvar_hud_##name##_size; \
 panel_bg_str = autocvar_hud_##name##_bg; \
@@ -161,7 +146,7 @@ panel_bg_color_team_str = autocvar_hud_##name##_bg_color_team; \
 panel_bg_alpha_str = autocvar_hud_##name##_bg_alpha; \
 panel_bg_border_str = autocvar_hud_##name##_bg_border; \
 panel_bg_padding_str = autocvar_hud_##name##_bg_padding; \
-HUD_Panel_StringVars
+HUD_Panel_StringVars()
 
 // Update all common cvars of given panel id
 #define HUD_Panel_UpdateCvarsForId(id) \