X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qh;h=db27a488f596218e091fc3cb2c4e5d2b245f9d12;hb=99e4fa0264127dfcf4675d5f645061b51af815e4;hp=fc3dd7422183fddc9aa1dc283bed76ff59529893;hpb=d28bb718bfd02ac65b80e6160d829a2b5f2edc4d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index fc3dd7422..db27a488f 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -1,10 +1,10 @@ -float log(float f); - -vector centerprint_start; - float panel_order[HUD_PANEL_NUM]; string hud_panelorder_prev; +float hud_draw_maximized; +float hud_panel_radar_maximized; +float hud_panel_itemstime; + vector mousepos; vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click) vector panel_click_resizeorigin; // coordinates for opposite point when resizing @@ -16,12 +16,6 @@ const float BORDER_MULTIPLIER = 0.25; float scoreboard_bottom; float weapon_accuracy[WEP_MAXCOUNT]; -#define MAX_ACCURACY_LEVELS 10 -float acc_lev[MAX_ACCURACY_LEVELS]; -vector acc_col[MAX_ACCURACY_LEVELS]; -float acc_levels; -string acc_color_levels; - float complain_weapon; string complain_weapon_name; float complain_weapon_type; @@ -30,7 +24,8 @@ float complain_weapon_time; float ps_primary, ps_secondary; float ts_primary, ts_secondary; -float last_weapon; +float last_switchweapon; +float last_activeweapon; float weapontime; float weaponprevtime; @@ -38,8 +33,8 @@ float teamnagger; float hud_configure_checkcollisions; float hud_configure_prev; -vector hud_configure_gridSize; -vector hud_configure_realGridSize; +noref vector hud_configure_gridSize; // fteqcc sucks +noref vector hud_configure_realGridSize; // fteqcc sucks float hudShiftState; const float S_SHIFT = 1; @@ -52,6 +47,7 @@ float menu_enabled_time; float hud_fade_alpha; string hud_skin_path; +string hud_skin_prev; var vector progressbar_color; @@ -131,7 +127,7 @@ if(!autocvar__hud_configure && panel_bg_str == "0") {\ // 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()\ if((teamplay) && panel_bg_color_team) {\ - panel_bg_color = colormapPaletteColor(mod(stof(getplayerkey(current_player - 1, "colors")), 16), 1) * panel_bg_color_team;\ + panel_bg_color = colormapPaletteColor(mod(stof(getplayerkeyvalue(current_player - 1, "colors")), 16), 1) * panel_bg_color_team;\ } else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team) {\ panel_bg_color = '1 0 0' * panel_bg_color_team;\ } else {\ @@ -139,9 +135,9 @@ if((teamplay) && panel_bg_color_team) {\ panel_bg_color = autocvar_hud_panel_bg_color;\ } else {\ if(panel_bg_color_str == "shirt") {\ - panel_bg_color = colormapPaletteColor(floor(stof(getplayerkey(current_player - 1, "colors")) / 16), 0);\ + panel_bg_color = colormapPaletteColor(floor(stof(getplayerkeyvalue(current_player - 1, "colors")) / 16), 0);\ } else if(panel_bg_color_str == "pants") {\ - panel_bg_color = colormapPaletteColor(mod(stof(getplayerkey(current_player - 1, "colors")), 16), 1);\ + panel_bg_color = colormapPaletteColor(mod(stof(getplayerkeyvalue(current_player - 1, "colors")), 16), 1);\ } else {\ panel_bg_color = stov(panel_bg_color_str);\ }\ @@ -156,6 +152,14 @@ if(panel_bg_color_team_str == "") {\ panel_bg_color_team = stof(panel_bg_color_team_str);\ } +// the check doesn't allow to fade this panel when showing the panel-specific menu dialog +#define HUD_Panel_ApplyFadeAlpha()\ +if(!(menu_enabled == 2 && highlightedPanel == hud_configure_active_panel))\ +{\ + panel_bg_alpha *= hud_fade_alpha;\ + panel_fg_alpha *= hud_fade_alpha;\ +} ENDS_WITH_CURLY_BRACE + // 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()\ @@ -170,19 +174,14 @@ if(autocvar__hud_configure) {\ 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 == hud_configure_active_panel)) {\ - panel_bg_alpha *= hud_fade_alpha;\ } // 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 -// comment on line 4 of macro: // don't fade this panel when showing the panel-specific menu dialog #define HUD_Panel_GetFgAlpha()\ panel_fg_alpha = autocvar_hud_panel_fg_alpha;\ if(autocvar__hud_configure && !panel_enabled)\ panel_fg_alpha = 0.25;\ -if(!(menu_enabled == 2 && highlightedPanel == hud_configure_active_panel))\ - panel_fg_alpha *= hud_fade_alpha; // Get border. See comments above, it's similar. #define HUD_Panel_GetBorder()\ @@ -283,6 +282,8 @@ if(menu_enabled == 2 && hud_configure_active_panel == highlightedPanel) {\ switch(id) { \ case HUD_PANEL_INFOMESSAGES: HUD_Panel_UpdateCvars(infomessages) break; \ case HUD_PANEL_PHYSICS: HUD_Panel_UpdateCvars(physics); break;\ + case HUD_PANEL_CENTERPRINT: HUD_Panel_UpdateCvars(centerprint); break;\ + case HUD_PANEL_ITEMSTIME: HUD_Panel_UpdateCvars(itemstime); break;\ } #define HUD_Panel_UpdateCvarsForId(id) \ @@ -320,6 +321,8 @@ HUD_Panel_GetBorder() switch(id) { \ case HUD_PANEL_INFOMESSAGES: HUD_Panel_UpdatePosSize(infomessages) break;\ case HUD_PANEL_PHYSICS: HUD_Panel_UpdatePosSize(physics); break;\ + case HUD_PANEL_CENTERPRINT: HUD_Panel_UpdatePosSize(centerprint); break;\ + case HUD_PANEL_ITEMSTIME: HUD_Panel_UpdatePosSize(itemstime); break;\ } #define HUD_Panel_UpdatePosSizeForId(id) \ @@ -340,3 +343,12 @@ switch(id) { \ case HUD_PANEL_ENGINEINFO: HUD_Panel_UpdatePosSize(engineinfo) break;\ default: HUD_Panel_UpdatePosSizeForId_Part2(id)\ } + +#define KN_MAX_ENTRIES 10 + +float kn_index; +float notify_times[KN_MAX_ENTRIES]; +string notify_icon[KN_MAX_ENTRIES]; +string notify_attackers[KN_MAX_ENTRIES]; +string notify_victims[KN_MAX_ENTRIES]; +void HUD_Notify_Push(string icon, string attacker, string victim);