const float BORDER_MULTIPLIER = 0.25;
float scoreboard_bottom;
-float weapon_hits[WEP_MAXCOUNT];
-float weapon_fired[WEP_MAXCOUNT];
+float weapon_accuracy[WEP_MAXCOUNT];
#define MAX_ACCURACY_LEVELS 10
float acc_lev[MAX_ACCURACY_LEVELS];
float hud_configure_checkcollisions;
float hud_configure_prev;
+vector hud_configure_gridSize;
+vector hud_configure_realGridSize;
float hudShiftState;
const float S_SHIFT = 1;
progressbar_color = stov(cvar_string("hud_progressbar_" #item "_color"))
#define HUD_Panel_GetProgressBarColorForString(item) \
switch(item) {\
- case "strength": HUD_Panel_GetProgressBarColor(strength); break;\
- case "shield": HUD_Panel_GetProgressBarColor(shield); break;\
case "health": HUD_Panel_GetProgressBarColor(health); break;\
case "armor": HUD_Panel_GetProgressBarColor(armor); break;\
+ case "strength": HUD_Panel_GetProgressBarColor(strength); break;\
+ case "shield": HUD_Panel_GetProgressBarColor(shield); break;\
case "fuel": HUD_Panel_GetProgressBarColor(fuel); break;\
case "nexball": HUD_Panel_GetProgressBarColor(nexball); break;\
} ENDS_WITH_CURLY_BRACE
panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha);\
}\
panel_bg_alpha = stof(panel_bg_alpha_str);\
-if(autocvar__hud_configure && menu_enabled == 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) {\
- panel_bg_alpha = 0.25;\
+if(autocvar__hud_configure) {\
+ if(!panel_enabled)\
+ panel_bg_alpha = 0.25;\
+ else if(menu_enabled == 2 && highlightedPanel == active_panel)\
+ panel_bg_alpha = (1 - autocvar__menu_alpha) * max(cvar("hud_configure_bg_minalpha"), panel_bg_alpha) + autocvar__menu_alpha * panel_bg_alpha;\
+ else\
+ panel_bg_alpha = max(cvar("hud_configure_bg_minalpha"), panel_bg_alpha);\
} if(!(menu_enabled == 2 && highlightedPanel == active_panel)) {\
panel_bg_alpha *= hud_fade_alpha;\
}
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()
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()\