X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qh;h=90a17b80be91b500fc2a0f8006098fdd618a956e;hb=f1a11cabe78baaaa067fe22bbdf2ca1546d1e8fc;hp=7da989492fab22e1c3682dcf57f6d4d5d0da21c0;hpb=bb9450d7c9e2d77e39d5cfcce7a0a74b76de3cf5;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index 7da989492..90a17b80b 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -1,7 +1,7 @@ #ifndef HUD_H #define HUD_H -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" const int HUD_PANEL_MAX = 24; entity hud_panel[HUD_PANEL_MAX]; @@ -12,6 +12,19 @@ int HUD_PANEL_LAST; int panel_order[HUD_PANEL_MAX]; string hud_panelorder_prev; +void HUD_Reset (void); +void HUD_Main (void); + +int vote_yescount; +int vote_nocount; +int vote_needed; +int vote_highlighted; // currently selected vote + +int vote_active; // is there an active vote? +int vote_prev; // previous state of vote_active to check for a change +float vote_alpha; +float vote_change; // "time" when vote_active changed + float hud_draw_maximized; float hud_panel_radar_maximized; float chat_panel_modified; @@ -36,8 +49,8 @@ float complain_weapon_time; int ps_primary, ps_secondary; int ts_primary, ts_secondary; -float last_switchweapon; -float last_activeweapon; +int last_switchweapon; +int last_activeweapon; float weapontime; float weaponprevtime; @@ -69,18 +82,19 @@ vector panel_size_backup; vector panel_size_copied; entity panel; -.string panel_name; -.int panel_id; -.vector current_panel_pos; -.vector current_panel_size; -.string current_panel_bg; -.float current_panel_bg_alpha; -.float current_panel_bg_border; -.vector current_panel_bg_color; -.float current_panel_bg_color_team; -.float current_panel_bg_padding; -.float current_panel_fg_alpha; -.float update_time; +entityclass(HUDPanel); +class(HUDPanel) .string panel_name; +class(HUDPanel) .int panel_id; +class(HUDPanel) .vector current_panel_pos; +class(HUDPanel) .vector current_panel_size; +class(HUDPanel) .string current_panel_bg; +class(HUDPanel) .float current_panel_bg_alpha; +class(HUDPanel) .float current_panel_bg_border; +class(HUDPanel) .vector current_panel_bg_color; +class(HUDPanel) .float current_panel_bg_color_team; +class(HUDPanel) .float current_panel_bg_padding; +class(HUDPanel) .float current_panel_fg_alpha; +class(HUDPanel) .float update_time; float panel_enabled; vector panel_pos; vector panel_size; @@ -97,11 +111,30 @@ string panel_bg_border_str; float panel_bg_padding; string panel_bg_padding_str; -.void() panel_draw; +class(HUDPanel) .void() panel_draw; float current_player; -float GetPlayerColorForce(float i); +float GetPlayerColorForce(int i); + +float stringwidth_colors(string s, vector theSize); +int GetPlayerColor(int i); +string GetPlayerName(int i); +float stringwidth_nocolors(string s, vector theSize); +void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag); + + +// prev_* vars contain the health/armor at the previous FRAME +// set to -1 when player is dead or was not playing +int prev_health, prev_armor; +float health_damagetime, armor_damagetime; +int health_beforedamage, armor_beforedamage; +// old_p_* vars keep track of previous values when smoothing value changes of the progressbar +int old_p_health, old_p_armor; +float old_p_healthtime, old_p_armortime; +// prev_p_* vars contain the health/armor progressbar value at the previous FRAME +// set to -1 to forcedly stop effects when we switch spectated player (e.g. from playerX: 70h to playerY: 50h) +int prev_p_health, prev_p_armor; #define HUD_PANELS(HUD_PANEL) \ @@ -122,7 +155,9 @@ float GetPlayerColorForce(float i); HUD_PANEL(INFOMESSAGES , HUD_InfoMessages , infomessages) \ HUD_PANEL(PHYSICS , HUD_Physics , physics) \ HUD_PANEL(CENTERPRINT , HUD_CenterPrint , centerprint) \ - HUD_PANEL(BUFFS , HUD_Buffs , buffs) + HUD_PANEL(BUFFS , HUD_Buffs , buffs) \ + HUD_PANEL(ITEMSTIME , HUD_ItemsTime , itemstime) \ + // always add new panels to the end of list #define HUD_PANEL(NAME, draw_func, name) \ int HUD_PANEL_##NAME; \ @@ -194,9 +229,9 @@ HUD_PANELS(HUD_PANEL) panel_bg_color = autocvar_hud_panel_bg_color; \ } else { \ if (panel_bg_color_str == "shirt") { \ - panel_bg_color = colormapPaletteColor(floor(stof(getplayerkeyvalue(current_player - 1, "colors")) / 16), 0);\ + panel_bg_color = colormapPaletteColor(floor(stof(getplayerkeyvalue(current_player, "colors")) / 16), 0); \ } else if (panel_bg_color_str == "pants") { \ - panel_bg_color = colormapPaletteColor(stof(getplayerkeyvalue(current_player - 1, "colors")) % 16, 1);\ + panel_bg_color = colormapPaletteColor(stof(getplayerkeyvalue(current_player, "colors")) % 16, 1); \ } else { \ panel_bg_color = stov(panel_bg_color_str); \ } \ @@ -255,37 +290,28 @@ HUD_PANELS(HUD_PANEL) } 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); \ + panel_bg_padding = min(min(panel_size.x, panel_size.y)/2 - 5, panel_bg_padding); \ } while(0) // return smoothly faded pos and size of given panel when a dialog is active -#define HUD_Panel_UpdatePosSize_ForMenu() do { \ - vector menu_enable_pos; \ - vector menu_enable_size = '0 0 0'; \ - float menu_enable_maxsize_x = 0.3 * vid_conwidth; \ - float menu_enable_maxsize_y = 0.18 * vid_conheight; \ - if (panel_size_x > panel_size_y) { \ - if (panel_size_y > menu_enable_maxsize_y) { \ - menu_enable_size_y = menu_enable_maxsize_y; \ - menu_enable_size_x = panel_size_x * (menu_enable_maxsize_y/panel_size_y); \ - panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size; \ - } \ - menu_enable_pos = eX * 0.5 * vid_conwidth - eX * 0.5 * panel_size_x + eY * (vid_conheight - menu_enable_maxsize_y);\ - } else { \ - if (panel_size_x > menu_enable_maxsize_x) { \ - menu_enable_size_x = menu_enable_maxsize_x; \ - menu_enable_size_y = panel_size_y * (menu_enable_maxsize_x/panel_size_x); \ - panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size; \ - } \ - menu_enable_pos = eY * 0.5 * vid_conheight - eY * 0.5 * panel_size_y + eX * (vid_conwidth - menu_enable_maxsize_x);\ - } \ - panel_pos = (1 - autocvar__menu_alpha) * panel_pos + (autocvar__menu_alpha) * menu_enable_pos; \ +// don't center too wide panels, it doesn't work with different resolutions +#define HUD_Panel_UpdatePosSize_ForMenu() do { \ + vector menu_enable_size = panel_size; \ + float max_panel_width = 0.52 * vid_conwidth; \ + if(panel_size.x > max_panel_width) \ + { \ + menu_enable_size.x = max_panel_width; \ + menu_enable_size.y = panel_size.y * (menu_enable_size.x / panel_size.x); \ + } \ + vector menu_enable_pos = eX * (panel_bg_border + 0.5 * max_panel_width) + eY * 0.5 * vid_conheight - 0.5 * menu_enable_size; \ + panel_pos = (1 - autocvar__menu_alpha) * panel_pos + (autocvar__menu_alpha) * menu_enable_pos; \ + panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size; \ } while(0) // Scale the pos and size vectors to absolute coordinates #define HUD_Panel_ScalePosSize() do { \ - panel_pos_x *= vid_conwidth; panel_pos_y *= vid_conheight; \ - panel_size_x *= vid_conwidth; panel_size_y *= vid_conheight; \ + panel_pos.x *= vid_conwidth; panel_pos.y *= vid_conheight; \ + panel_size.x *= vid_conwidth; panel_size.y *= vid_conheight; \ } while(0) // NOTE: in hud_configure mode cvars must be reloaded every frame @@ -350,7 +376,7 @@ HUD_PANELS(HUD_PANEL) } while(0) const int NOTIFY_MAX_ENTRIES = 10; -const int NOTIFY_ICON_MARGIN = 0.02; +const float NOTIFY_ICON_MARGIN = 0.02; int notify_index; int notify_count; @@ -363,4 +389,4 @@ void HUD_Notify_Push(string icon, string attacker, string victim); var void HUD_ModIcons_GameType(vector pos, vector size); void HUD_ModIcons_SetFunc(); -#endif \ No newline at end of file +#endif