X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud.qc;h=99605536018ba17e8a9fabe330b7af957079f938;hp=920ee1ebd163ae271d12e0cc52d966e8ea634581;hb=109c5785a22fb4336ac5e91d5f1fa91678582164;hpb=a4e71642208a27102c82a782b72a72efc7d342bf diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index 920ee1ebd..996055360 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -1,18 +1,18 @@ #include "hud.qh" #include "hud_config.qh" -#include "mapvoting.qh" -#include "scoreboard.qh" -#include "teamradar.qh" -#include "../common/t_items.qh" -#include "../common/deathtypes/all.qh" -#include "../common/items/all.qc" -#include "../common/mapinfo.qh" -#include "../common/mutators/mutator/waypoints/all.qh" -#include "../common/stats.qh" -#include "../lib/csqcmodel/cl_player.qh" -// TODO: remove -#include "../server/mutators/mutator/gamemode_ctf.qc" +#include "../mapvoting.qh" +#include "../scoreboard.qh" +#include "../teamradar.qh" +#include +#include +#include +#include +#include +#include +#include +#include +#include // TODO: remove /* @@ -68,12 +68,14 @@ vector HUD_Get_Num_Color (float x, float maxvalue) float HUD_GetRowCount(int item_count, vector size, float item_aspect) { + TC(int, item_count); float aspect = size_y / size_x; return bound(1, floor((sqrt(4 * item_aspect * aspect * item_count + aspect * aspect) + aspect + 0.5) / 2), item_count); } vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect) { + TC(int, item_count); float columns, rows; float ratio, best_ratio = 0; float best_columns = 1, best_rows = 1; @@ -112,85 +114,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) -{ - 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 @@ -200,6 +123,7 @@ HUD panels //basically the same code of draw_ButtonPicture and draw_VertButtonPicture for the menu void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag) { + TC(bool, vertical); TC(int, drawflag); if(!length_ratio || !theAlpha) return; if(length_ratio > 1) @@ -303,6 +227,7 @@ void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, flo void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theAlpha, int drawflag) { + TC(int, drawflag); if(!theAlpha) return; @@ -320,6 +245,7 @@ void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theA void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha, float fadelerp) { + TC(bool, vertical); TC(bool, icon_right_align); vector newPos = '0 0 0', newSize = '0 0 0'; vector picpos, numpos; @@ -397,8 +323,9 @@ void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bo drawpic_aspect_skin_expanding(picpos, icon, '1 1 0' * newSize.y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp); } -void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha) +void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertical, int icon_right_align, vector color, float theAlpha) { + TC(bool, vertical); TC(int, icon_right_align); DrawNumIcon_expanding(myPos, mySize, x, icon, vertical, icon_right_align, color, theAlpha, 0); } @@ -410,6 +337,8 @@ Main HUD system ================== */ +void CSQC_BUMBLE_GUN_HUD(); + void HUD_Vehicle() { if(autocvar__hud_configure) return; @@ -418,13 +347,14 @@ void HUD_Vehicle() if(hud == HUD_BUMBLEBEE_GUN) CSQC_BUMBLE_GUN_HUD(); else { - Vehicle info = get_vehicleinfo(hud); + Vehicle info = Vehicles_from(hud); info.vr_hud(info); } } bool HUD_Panel_CheckFlags(int showflags) { + TC(int, showflags); if ( HUD_Minigame_Showpanels() ) return showflags & PANEL_SHOW_MINIGAME; if(intermission == 2)