Update Statistics menu to use the same font as the micro version of the Timestamp

This commit is contained in:
toaster 2024-04-05 00:46:19 +01:00
parent 0427f7f3ff
commit e3a22019ab
3 changed files with 28 additions and 17 deletions

View file

@ -1930,6 +1930,19 @@ tic_t K_TranslateTimer(tic_t drawtime, UINT8 mode, INT32 *return_jitter)
return drawtime; return drawtime;
} }
INT32 K_drawKartMicroTime(const char *todrawtext, INT32 workx, INT32 worky, INT32 splitflags)
{
using srb2::Draw;
Draw::TextElement text(todrawtext);
text.flags(splitflags);
text.font(Draw::Font::kZVote);
INT32 result = text.width();
Draw(workx - result, worky).text(text);
return result;
}
void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, UINT8 mode) void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, UINT8 mode)
{ {
// TIME_X = BASEVIDWIDTH-124; // 196 // TIME_X = BASEVIDWIDTH-124; // 196
@ -2006,13 +2019,7 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, U
} }
} }
using srb2::Draw; workx -= K_drawKartMicroTime(stickermedalinfo.targettext, workx, worky, splitflags);
Draw::TextElement text(stickermedalinfo.targettext);
text.flags(splitflags);
text.font(Draw::Font::kZVote);
workx -= text.width();
Draw(workx, worky).text(text);
} }
workx -= (((1 + i - stickermedalinfo.platinumcount)*6) - 1); workx -= (((1 + i - stickermedalinfo.platinumcount)*6) - 1);

View file

@ -45,6 +45,7 @@ void K_drawKartFreePlay(void);
void K_drawKartPowerUps(void); void K_drawKartPowerUps(void);
void K_drawSpectatorHUD(boolean director); void K_drawSpectatorHUD(boolean director);
void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, UINT8 mode); void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, UINT8 mode);
INT32 K_drawKartMicroTime(const char *todrawtext, INT32 workx, INT32 worky, INT32 splitflags);
void K_drawKart2PTimestamp(void); void K_drawKart2PTimestamp(void);
void K_drawKart4PTimestamp(void); void K_drawKart4PTimestamp(void);
void K_drawEmeraldWin(boolean overlay); void K_drawEmeraldWin(boolean overlay);

View file

@ -8178,20 +8178,23 @@ static void M_DrawStatsMaps(void)
{ {
besttime = mapheaderinfo[mnum]->records.timeattack.time; besttime = mapheaderinfo[mnum]->records.timeattack.time;
const char *todrawtext = "--'--\"--";
if (besttime) if (besttime)
{ {
V_DrawRightAlignedString((BASEVIDWIDTH-24), y+1, 0, todrawtext = va("%02d'%02d\"%02d",
va("%02d'%02d\"%02d", G_TicsToMinutes(besttime, true),
G_TicsToMinutes(besttime, true), G_TicsToSeconds(besttime),
G_TicsToSeconds(besttime), G_TicsToCentiseconds(besttime)
G_TicsToCentiseconds(besttime)
)
); );
} }
else
{ K_drawKartMicroTime(
V_DrawRightAlignedString((BASEVIDWIDTH-24), y+1, V_GRAYMAP, "--'--\"--"); todrawtext,
} (BASEVIDWIDTH-24),
y,
(besttime ? 0 : V_TRANSLUCENT)
);
} }
M_DrawMapMedals(mnum, medalspos - 8, y, allowtime, allowencore, allowspb); M_DrawMapMedals(mnum, medalspos - 8, y, allowtime, allowencore, allowspb);