From: MirceaKitsune Date: Fri, 15 Apr 2011 01:32:44 +0000 (+0300) Subject: Finally fix the HUD, and make positioning with all fonts work. The new fonts are... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5097bed54fa4bffe420c03b33a3efbce53890437;p=voretournament%2Fvoretournament.git Finally fix the HUD, and make positioning with all fonts work. The new fonts are stable and working now. --- diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc index da8488bb..5df68f64 100644 --- a/data/qcsrc/client/sbar.qc +++ b/data/qcsrc/client/sbar.qc @@ -1652,7 +1652,8 @@ void Sbar_DrawRaceStatus(vector pos) void Sbar_Score() { float score, distribution, leader; - vector score_pos, secondary_score_pos, distribution_color; + vector score_pos, secondary_score_pos, race_score_pos, distribution_color; + string racetime; entity tm, pl, me; me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1]; @@ -1679,11 +1680,19 @@ void Sbar_Score() float racemin, racesec, racemsec; float distsec, distmsec, minusplus; + string s_racemin, s_racesec, s_racemsec; racemin = floor(score/(60 * TIME_FACTOR)); racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR); racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR; + if(racemin < 10) s_racemin = strcat("0", ftos(racemin)); + else s_racemin = ftos(racemin); + if(racesec < 10) s_racesec = strcat("0", ftos(racesec)); + else s_racesec = ftos(racesec); + if(racemsec < 10) s_racemsec = strcat("0", ftos(racemsec)); + else s_racemsec = ftos(racemsec); + if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) { // distribution display distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]); @@ -1705,16 +1714,14 @@ void Sbar_Score() distribution_color = '1 0 0'; minusplus = 2; // minusplus 1: always prefix with plus sign } - Sbar_DrawXNum(score_pos + '212 -4 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL); - Sbar_DrawXNum(score_pos + '212 12 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL); + Sbar_DrawXNum(score_pos + '222 -6 0' - '14 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 14, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL); + Sbar_DrawXNum(score_pos + '222 6 0' - '14 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 14, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL); } - Sbar_DrawXNum(score_pos + '192 0 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); - Sbar_DrawXNum(score_pos + '192 0 0' - TIME_DECIMALS * '30 0 0' - '66 0 0', racesec, -2, 0, 30, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); - drawstring(score_pos + '192 0 0' - TIME_DECIMALS * '30 0 0' - '21 0 0', ".", '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE); - - Sbar_DrawXNum(score_pos + '192 0 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); - drawstring(score_pos + '192 0 0' - TIME_DECIMALS * '30 0 0' - '88 0 0', ":", '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE); + racetime = strcat(s_racemin, " : ", s_racesec, " . ", s_racemsec); + race_score_pos = top + '0 0 0'; + race_score_pos -= '1 0 0' * stringwidth(racetime, FALSE, '30 30 0') * 0.5; + drawstring(race_score_pos, racetime, '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE); } else if (!teamplay) { // non-teamgames, except race/cts // me vector := [team/connected frags id] @@ -1884,7 +1891,8 @@ void Sbar_Score() void Sbar_Timer() { float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft; - vector bgpos, timer_color; + vector pos, bgpos, timer_color; + string finaltime; bgpos = '0 0 0'; vector topright; @@ -1933,13 +1941,13 @@ void Sbar_Timer() minutes = minutesLeft; seconds = secondsLeft; if (minutes == 0) - bgpos_x = topright_x - (36 + 7 + 12) * scale; + bgpos_x = topright_x - (58 + 7 + 12) * scale; else if (minutes < 10) // nudge the timer background left if more digits are drawn - bgpos_x = topright_x - (54 + 17 + 12) * scale; + bgpos_x = topright_x - (66 + 17 + 12) * scale; else if (minutes < 100) - bgpos_x = topright_x - (72 + 17 + 12) * scale; + bgpos_x = topright_x - (74 + 17 + 12) * scale; else - bgpos_x = topright_x - (90 + 17 + 12) * scale; + bgpos_x = topright_x - (82 + 17 + 12) * scale; bgpos_y = 0; bgpos_z = 0; } @@ -1958,10 +1966,16 @@ void Sbar_Timer() drawpic(topright - ('19 0 0' + '3 0 0' - '0 2 0'), "gfx/hud/sb_time", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); if(minutesLeft >= 1 || cvar("sbar_increment_maptime") || timelimit == 0 || warmup_stage) { - Sbar_DrawXNum(topright - ('50 -2 0' - '0 2 0') - (strlen(ftos(minutes)) * 18 * scale * '0.5 0 0'), minutes, 3, 0, 18 * scale, timer_color, sbar_alpha_fg, DRAWFLAG_NORMAL); - drawstring(topright - ('48 -2 0' - '0 1 0'), ":", '18 18 0' * scale, timer_color, sbar_alpha_fg, DRAWFLAG_NORMAL); + finaltime = strcat(ftos(minutes), ":"); } - Sbar_DrawXNum(topright - ('37 -2 0' + '3 0 0' - '0 2 0'), seconds, -2, 0, 18 * scale, timer_color, sbar_alpha_fg, DRAWFLAG_NORMAL); + if(seconds < 10) + finaltime = strcat(finaltime, "0", ftos(seconds)); + else + finaltime = strcat(finaltime, ftos(seconds)); + + pos = topright - ('24 -2 0' + '3 0 0' - '0 2 0'); + pos -= '1 0 0' * stringwidth(finaltime, FALSE, 18 * scale * '1 1 0'); + drawstring(pos, finaltime, 18 * scale * '1 1 0', timer_color, sbar_alpha_fg, DRAWFLAG_NORMAL); } void CSQC_Strength_Timer() { @@ -2008,7 +2022,7 @@ void CSQC_Strength_Timer() { { drawpic(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE); } - Sbar_DrawXNum(pos - '20 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + Sbar_DrawXNum(pos - '30 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); } else if(dt > -1) { @@ -2031,7 +2045,7 @@ void CSQC_Strength_Timer() { { drawpic(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE); } - Sbar_DrawXNum(pos - '20 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + Sbar_DrawXNum(pos - '30 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); } else if(dt > -1) { @@ -2926,9 +2940,12 @@ void Sbar_Draw (void) float stomach_load; stomach_load = getstati(STAT_VORE_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise - Sbar_DrawXNum(bottomleft - '-26 171 0', bound(0, stomach_load, 9), 1, 0, 22, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); - drawstring(bottomleft - '-41 171 0', "/", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); - Sbar_DrawXNum(bottomleft - '-50 171 0', bound(0, g_balance_vore_swallow_limit, 9), 1, 0, 22, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + vector status_pos; + string status_text; + status_text = strcat(ftos(bound(0, stomach_load, 9)), "/", ftos(bound(0, g_balance_vore_swallow_limit, 9))); + status_pos = bottomleft - '-43 171 0'; + status_pos -= '1 0 0' * stringwidth(status_text, FALSE, '22 22 0') * 0.5; + drawstring(status_pos, status_text, '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); if(getstati(STAT_VORE_DIGESTING)) drawstring(bottomleft - '-76 142 0', "stomach digesting", '12 12 0', '1 0.5 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL); @@ -3008,13 +3025,15 @@ void Sbar_Draw (void) pos_y = bottom_y - 20; float weapon_clipload, weapon_clipsize; + vector ammo_pos_offset; // if we are using the jetpack, show fuel ammo. Otherwise show the ammo of our weapon if(stat_items & IT_JETPACK && button_jetpack) { a = getstati(GetAmmoStat(0)); // how much fuel do we have? drawpic(pos - '98 18 0', GetAmmoPicture(0), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); - Sbar_DrawXNum(pos - '128 16 0', a, 3, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '16 16 0') * 0.5; + Sbar_DrawXNum(pos - '118 16 0' - ammo_pos_offset, a, 3, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); } else { @@ -3032,13 +3051,23 @@ void Sbar_Draw (void) { weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD); if(weapon_clipload < 0) // we're reloading - drawstring(pos - '128 23 0', "- -", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + { + ammo_pos_offset = '1 0 0' * stringwidth("- -", FALSE, '16 16 0') * 0.5; + drawstring(pos - '118 23 0' - ammo_pos_offset, "- -", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + } else - Sbar_DrawXNum(pos - '128 23 0', weapon_clipload, 2, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); - Sbar_DrawXNum(pos - '128 7 0', a, 3, 0, 12, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + { + ammo_pos_offset = '1 0 0' * stringwidth(ftos(weapon_clipload), FALSE, '16 16 0') * 0.5; + Sbar_DrawXNum(pos - '118 23 0' - ammo_pos_offset, weapon_clipload, 2, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + } + ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '12 12 0') * 0.5; + Sbar_DrawXNum(pos - '118 7 0' - ammo_pos_offset, a, 3, 0, 12, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); } else - Sbar_DrawXNum(pos - '128 16 0', a, 3, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + { + ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '16 16 0') * 0.5; + Sbar_DrawXNum(pos - '118 16 0' - ammo_pos_offset, a, 3, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + } } } }