X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qh;h=3494e9998151a532f8ee79be8ab6db412c651c82;hb=75f25de6a6bc96b4b1311600f7e2d8fde56f9fe7;hp=2b5394c163541c09edb9628bf411ed4629dc8f8c;hpb=b42a2b0a6c12ccbb208bd8cafb0a8405adbc3ae0;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index 2b5394c16..3494e9998 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -1,5 +1,7 @@ float log(float f); +vector centerprint_start; + float panel_order[HUD_PANEL_NUM]; string hud_panelorder_prev; @@ -20,6 +22,7 @@ float weapon_fired[WEP_MAXCOUNT]; #define MAX_ACCURACY_LEVELS 10 float acc_lev[MAX_ACCURACY_LEVELS]; float acc_levels; +string acc_color_levels; float complain_weapon; string complain_weapon_name; @@ -31,11 +34,9 @@ float ts_primary, ts_secondary; float last_weapon; float weapontime; +float weaponprevtime; float teamnagger; -float hud_accuracy_hud; -float hud_border_thickness; -float hud_accuracy_border_thickness; float hud_configure_checkcollisions; float hud_configure_prev; @@ -45,8 +46,10 @@ const float S_SHIFT = 1; const float S_CTRL = 2; const float S_ALT = 4; -float disable_menu_alphacheck; // 0 = enable alpha check, 1 = disable for entire hud, 2 = disable for one panel -float menu_fade_alpha; +float menu_enabled; // 1 showing the entire HUD, 2 showing only the clicked panel +float menu_enabled_time; + +float hud_fade_alpha; string hud_skin_path; @@ -86,23 +89,23 @@ var float panel_accuracy_info_top; var float panel_accuracy_foreground_alpha; var float panel_accuracy_alreadyvoted_alpha; -var string picpath; - // Because calling lots of functions in QC apparently cuts fps in half on many machines: // ---------------------- // MACRO HELL STARTS HERE // ---------------------- -// Little help for the poor people who have to make sense of this: Start from the bottom +// Little help for the poor people who have to make sense of this: Start from the bottom ;) #define HUD_Panel_GetProgressBarColor(item) \ + progressbar_color = autocvar_hud_progressbar_##item##_color +#define HUD_Panel_GetProgressBarColorForString(item) \ switch(item) {\ - case "strength": progressbar_color = autocvar_hud_progressbar_strength_color; break;\ - case "shield": progressbar_color = autocvar_hud_progressbar_shield_color; break;\ - case "health": progressbar_color = autocvar_hud_progressbar_health_color; break;\ - case "armor": progressbar_color = autocvar_hud_progressbar_armor_color; break;\ - case "fuel": progressbar_color = autocvar_hud_progressbar_fuel_color; break;\ - case "nexball": progressbar_color = autocvar_hud_progressbar_nexball_color; break;\ -} + 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 "fuel": HUD_Panel_GetProgressBarColor(fuel); break;\ + case "nexball": HUD_Panel_GetProgressBarColor(nexball); break;\ +} ENDS_WITH_CURLY_BRACE // 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... @@ -111,18 +114,19 @@ if(!autocvar__hud_configure && panel_bg_str == "0") {\ panel_bg = "0";\ } else {\ if(panel_bg_str == "") {\ - panel_bg = autocvar_hud_panel_bg;\ - } else if(panel_bg_str == "0" && autocvar__hud_configure) {\ - panel_bg = autocvar_hud_panel_bg;\ - panel_bg_alpha_str = "0";\ - } else {\ - panel_bg = panel_bg_str;\ + panel_bg_str = autocvar_hud_panel_bg;\ }\ - panel_bg = strcat(hud_skin_path, "/", panel_bg);\ - if(precache_pic(panel_bg) == "") {\ - panel_bg = strcat(hud_skin_path, "/", "border");\ + if(panel_bg_str == "0" && !autocvar__hud_configure) {\ + panel_bg = "0";\ + } else {\ + if (panel_bg_str == "0" && autocvar__hud_configure)\ + panel_bg_alpha_str = "0";\ + panel_bg = strcat(hud_skin_path, "/", panel_bg_str);\ if(precache_pic(panel_bg) == "") {\ - panel_bg = strcat("gfx/hud/default/", "border");\ + panel_bg = strcat(hud_skin_path, "/", "border_default");\ + if(precache_pic(panel_bg) == "") {\ + panel_bg = strcat("gfx/hud/default/", "border_default");\ + }\ }\ }\ } @@ -162,14 +166,14 @@ if(panel_bg_alpha_str == "") {\ panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha);\ }\ panel_bg_alpha = stof(panel_bg_alpha_str);\ -if(autocvar__hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == active_panel) {\ +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(!(disable_menu_alphacheck == 2 && highlightedPanel == active_panel)) {\ - panel_bg_alpha *= menu_fade_alpha;\ +} if(!(menu_enabled == 2 && highlightedPanel == active_panel)) {\ + panel_bg_alpha *= hud_fade_alpha;\ } // Get value for panel_fg_alpha. Also do various minalpha checks @@ -179,8 +183,8 @@ if(autocvar__hud_configure && disable_menu_alphacheck == 2 && highlightedPanel = panel_fg_alpha = autocvar_hud_panel_fg_alpha;\ if(autocvar__hud_configure && !panel_enabled)\ panel_fg_alpha = 0.25;\ -if(!(disable_menu_alphacheck == 2 && highlightedPanel == active_panel))\ - panel_fg_alpha *= menu_fade_alpha; +if(!(menu_enabled == 2 && highlightedPanel == active_panel))\ + panel_fg_alpha *= hud_fade_alpha; // Get border. See comments above, it's similar. #define HUD_Panel_GetBorder()\ @@ -188,7 +192,7 @@ if(panel_bg_border_str == "") {\ panel_bg_border = autocvar_hud_panel_bg_border;\ } else {\ panel_bg_border = stof(panel_bg_border_str);\ -} +} ENDS_WITH_CURLY_BRACE // Scale the pos and size vectors to absolute coordinates #define HUD_Panel_GetScaledVectors()\ @@ -264,10 +268,10 @@ panel_bg_alpha_str = autocvar_hud_panel_##name##_bg_alpha; \ panel_bg_border_str = autocvar_hud_panel_##name##_bg_border; \ panel_bg_padding_str = autocvar_hud_panel_##name##_bg_padding; \ HUD_Panel_StringVars()\ -if(disable_menu_alphacheck == 2 && active_panel == highlightedPanel) {\ +if(menu_enabled == 2 && active_panel == highlightedPanel) {\ HUD_Panel_GetMenuSize()\ HUD_Panel_GetMenuPos()\ -} +} ENDS_WITH_CURLY_BRACE // Update all common cvars of given panel id #define HUD_Panel_UpdateCvarsForId(id) \ @@ -293,7 +297,7 @@ switch(id) { \ panel_pos = autocvar_hud_panel_##name##_pos; \ panel_size = autocvar_hud_panel_##name##_size; \ HUD_Panel_GetScaledVectors()\ -if(disable_menu_alphacheck == 2 && active_panel == highlightedPanel) {\ +if(menu_enabled == 2 && active_panel == highlightedPanel) {\ HUD_Panel_GetMenuSize()\ HUD_Panel_GetMenuPos()\ }\