X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud.qc;h=91dc98fdcb2c32f7efa917bafd3b8912c1574644;hb=4ee2807b2d8f808928ef14b3e814945b3edb4350;hp=f27870988a6b62470c36f4bd57cb5a2c6901d6ca;hpb=632c547367cea91f7df73f4af95d79556dbc83d4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index f27870988..91dc98fdc 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -1,12 +1,13 @@ #include "hud.qh" +#include "panel/scoreboard.qh" + #include "hud_config.qh" #include "../mapvoting.qh" -#include "../scoreboard.qh" #include "../teamradar.qh" #include #include -#include +#include #include #include #include @@ -114,86 +115,6 @@ vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspe return eX * best_columns + eY * best_rows; } -// return the string of the onscreen race timer -string MakeRaceString(int cp, float mytime, float theirtime, float lapdelta, string theirname) -{ - TC(int, cp); - string col; - string timestr; - string cpname; - string lapstr; - lapstr = ""; - - if(theirtime == 0) // goal hit - { - if(mytime > 0) - { - timestr = strcat("+", ftos_decimals(+mytime, TIME_DECIMALS)); - col = "^1"; - } - else if(mytime == 0) - { - timestr = "+0.0"; - col = "^3"; - } - else - { - timestr = strcat("-", ftos_decimals(-mytime, TIME_DECIMALS)); - col = "^2"; - } - - if(lapdelta > 0) - { - lapstr = sprintf(_(" (-%dL)"), lapdelta); - col = "^2"; - } - else if(lapdelta < 0) - { - lapstr = sprintf(_(" (+%dL)"), -lapdelta); - col = "^1"; - } - } - else if(theirtime > 0) // anticipation - { - if(mytime >= theirtime) - timestr = strcat("+", ftos_decimals(mytime - theirtime, TIME_DECIMALS)); - else - timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(theirtime)); - col = "^3"; - } - else - { - col = "^7"; - timestr = ""; - } - - if(cp == 254) - cpname = _("Start line"); - else if(cp == 255) - cpname = _("Finish line"); - else if(cp) - cpname = sprintf(_("Intermediate %d"), cp); - else - cpname = _("Finish line"); - - if(theirtime < 0) - return strcat(col, cpname); - else if(theirname == "") - return strcat(col, sprintf("%s (%s)", cpname, timestr)); - else - return strcat(col, sprintf("%s (%s %s)", cpname, timestr, strcat(theirname, col, lapstr))); -} - -// Check if the given name already exist in race rankings? In that case, where? (otherwise return 0) -int race_CheckName(string net_name) -{ - int i; - for (i=RANKINGS_CNT-1;i>=0;--i) - if(grecordholder[i] == net_name) - return i+1; - return 0; -} - /* ================== HUD panels @@ -329,9 +250,9 @@ void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theA drawsubpic(pos + eX * mySize.x - eX * min(mySize.x * 0.5, mySize.y), eX * min(mySize.x * 0.5, mySize.y) + eY * mySize.y, pic, '0.75 0 0', '0.25 1 0', color, theAlpha, drawflag); } -void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha, float fadelerp) +void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, int icon_right_align, vector color, float theAlpha, float fadelerp) { - TC(bool, vertical); TC(bool, icon_right_align); + TC(bool, vertical); TC(int, icon_right_align); vector newPos = '0 0 0', newSize = '0 0 0'; vector picpos, numpos; @@ -415,8 +336,6 @@ void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertica DrawNumIcon_expanding(myPos, mySize, x, icon, vertical, icon_right_align, color, theAlpha, 0); } -#include "all.inc" - /* ================== Main HUD system @@ -438,6 +357,8 @@ void HUD_Vehicle() } } +bool HUD_Minigame_Showpanels(); + bool HUD_Panel_CheckFlags(int showflags) { TC(int, showflags); @@ -463,14 +384,14 @@ void HUD_Panel_Draw(entity panent) void HUD_Reset() { // reset gametype specific icons - if(gametype == MAPINFO_TYPE_CTF) - HUD_Mod_CTF_Reset(); + if(gametype.m_modicons_reset) + gametype.m_modicons_reset(); } -float autocvar_hud_dynamic_shake; -float autocvar_hud_dynamic_shake_damage_max; -float autocvar_hud_dynamic_shake_damage_min; -float autocvar_hud_dynamic_shake_scale; +float autocvar_hud_dynamic_shake = 1; +float autocvar_hud_dynamic_shake_damage_max = 130; +float autocvar_hud_dynamic_shake_damage_min = 10; +float autocvar_hud_dynamic_shake_scale = 0.2; float hud_dynamic_shake_x[10] = {0, 1, -0.7, 0.5, -0.3, 0.2, -0.1, 0.1, 0.0, 0}; float hud_dynamic_shake_y[10] = {0, 0.4, 0.8, -0.2, -0.6, 0.0, 0.3, 0.1, -0.1, 0}; bool Hud_Shake_Update() @@ -494,6 +415,7 @@ bool Hud_Shake_Update() return true; } +entity CSQCModel_server2csqc(int i); void calc_followmodel_ofs(entity view); void Hud_Dynamic_Frame() { @@ -505,34 +427,43 @@ void Hud_Dynamic_Frame() entity view = CSQCModel_server2csqc(player_localentnum - 1); calc_followmodel_ofs(view); ofs = -cl_followmodel_ofs * autocvar_hud_dynamic_follow_scale; + ofs.x *= autocvar_hud_dynamic_follow_scale_xyz.z; + ofs.y *= autocvar_hud_dynamic_follow_scale_xyz.x; + ofs.z *= autocvar_hud_dynamic_follow_scale_xyz.y; + + if (fabs(ofs.x) < 0.001) ofs.x = 0; + if (fabs(ofs.y) < 0.001) ofs.y = 0; + if (fabs(ofs.z) < 0.001) ofs.z = 0; + ofs.x = bound(-0.1, ofs.x, 0.1); + ofs.y = bound(-0.1, ofs.y, 0.1); + ofs.z = bound(-0.1, ofs.z, 0.1); + + hud_shift.x = ofs.y * vid_conwidth; + hud_shift.y = ofs.z * vid_conheight; + hud_shift.z = ofs.x; + + hud_scale.x = (1 + hud_shift.z); + hud_scale.y = hud_scale.x; } - if (fabs(ofs.x) < 0.001) ofs.x = 0; - if (fabs(ofs.y) < 0.001) ofs.y = 0; - if (fabs(ofs.z) < 0.001) ofs.z = 0; - ofs.x = bound(-0.1, ofs.x, 0.1); - ofs.y = bound(-0.1, ofs.y, 0.1); - ofs.z = bound(-0.1, ofs.z, 0.1); - - hud_shift.x = ofs.y * vid_conwidth; - hud_shift.y = ofs.z * vid_conheight; - hud_shift.z = ofs.x; - - hud_scale.x = (1 + hud_shift.z); - hud_scale.y = hud_scale.x; - - float health = STAT(HEALTH); - if(autocvar_hud_dynamic_shake > 0 && !autocvar__hud_configure && health > 0) + if(autocvar_hud_dynamic_shake > 0) { + static float old_health = 0; + float health = max(-1, STAT(HEALTH)); if(hud_dynamic_shake_factor == -1) // don't allow the effect for this frame + { hud_dynamic_shake_factor = 0; + old_health = health; + } else { float new_hud_dynamic_shake_factor = 0; - if(prev_health - health >= autocvar_hud_dynamic_shake_damage_min && autocvar_hud_dynamic_shake_damage_max > autocvar_hud_dynamic_shake_damage_min) + if (old_health - health >= autocvar_hud_dynamic_shake_damage_min + && autocvar_hud_dynamic_shake_damage_max > autocvar_hud_dynamic_shake_damage_min + && old_health > 0 && !intermission) { float m = max(autocvar_hud_dynamic_shake_damage_min, 1); - new_hud_dynamic_shake_factor = (prev_health - health - m) / (autocvar_hud_dynamic_shake_damage_max - m); + new_hud_dynamic_shake_factor = (old_health - health - m) / (autocvar_hud_dynamic_shake_damage_max - m); if(new_hud_dynamic_shake_factor >= 1) new_hud_dynamic_shake_factor = 1; if(new_hud_dynamic_shake_factor >= hud_dynamic_shake_factor) @@ -541,16 +472,17 @@ void Hud_Dynamic_Frame() hud_dynamic_shake_time = time; } } + old_health = health; if(hud_dynamic_shake_factor) if(!Hud_Shake_Update()) hud_dynamic_shake_factor = 0; } - } - if(hud_dynamic_shake_factor > 0) - { - hud_shift.x += hud_dynamic_shake_realofs.x; - hud_shift.y += hud_dynamic_shake_realofs.y; + if(hud_dynamic_shake_factor > 0) + { + hud_shift.x += hud_dynamic_shake_realofs.x; + hud_shift.y += hud_dynamic_shake_realofs.y; + } } hud_scale_center.x = 0.5 * vid_conwidth; @@ -563,14 +495,13 @@ void Hud_Dynamic_Frame() void HUD_Main() { int i; - // global hud theAlpha fade - if(menu_enabled == 1) + // global hud alpha fade (scoreboard-related panels behave differently and override it temporarly) + if(hud_configure_menu_open == 1) hud_fade_alpha = 1; + else if(!autocvar__hud_configure) + hud_fade_alpha = (1 - scoreboard_fade_alpha) * (1 - autocvar__menu_alpha); else - hud_fade_alpha = (1 - autocvar__menu_alpha); - - if(scoreboard_fade_alpha) - hud_fade_alpha = (1 - scoreboard_fade_alpha); + hud_fade_alpha = 1 - autocvar__menu_alpha; HUD_Configure_Frame(); @@ -580,8 +511,14 @@ void HUD_Main() // they must fade only when the menu does if(scoreboard_fade_alpha == 1) { - HUD_Panel_Draw(HUD_PANEL(CENTERPRINT)); - return; + if(autocvar__menu_alpha == 1) + return; + if(scoreboard_fade_alpha == 1) + { + HUD_Panel_Draw(HUD_PANEL(SCOREBOARD)); + HUD_Panel_Draw(HUD_PANEL(CENTERPRINT)); + return; + } } if(!autocvar__hud_configure && !hud_fade_alpha) @@ -672,7 +609,7 @@ void HUD_Main() } } if (warning) - LOG_TRACE("Automatically fixed wrong/missing panel numbers in _hud_panelorder\n"); + LOG_TRACE("Automatically fixed wrong/missing panel numbers in _hud_panelorder"); cvar_set("_hud_panelorder", s); if(hud_panelorder_prev)