From f7e99d6f330f5c407eccff40059a8c4b0647eb9b Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sun, 25 Feb 2024 10:26:40 -0500 Subject: [PATCH] Add coloring to large numbers --- src/k_kart.c | 11 +++++++++-- src/v_video.c | 21 +++++++++++++++++++++ src/v_video.h | 1 + 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 3a284306b..951e12234 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9393,13 +9393,20 @@ static void K_drawDriftGauge(void) // right, also draw a cool number //SG_DrawPaddedNum(v, basex + (dup*32), basey, driftcharge*100 / driftval, 3, "PINGN", V_NOSCALESTART|V_OFFSET|drifttrans, cmap) if (cv_driftgaugestyle.value == 3) - V_DrawPaddedTallNum(basex + (dup*32), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3); + V_DrawPaddedTallColorNum(basex + (dup*32), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3, cmap); else V_DrawPingNum(cv_driftgaugestyle.value == 2 ? basex + (dup*22) : basex + (dup*32), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, cmap); } break; case 4: - V_DrawPaddedTallNum(basex + (dup*16), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3); + UINT8 *cmap; + INT32 level = min(driftcharge / driftval, 2); + if (driftcharge >= driftval*4) + cmap = R_GetTranslationColormap(TC_RAINBOW, 1 + leveltime % (MAXSKINCOLORS-1),GTC_CACHE); + else + cmap = R_GetTranslationColormap(TC_RAINBOW, driftskins[level],GTC_CACHE); + + V_DrawPaddedTallColorNum(basex + (dup*16), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3, cmap); break; default: break; diff --git a/src/v_video.c b/src/v_video.c index c2c05b976..2d25a2c64 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -2471,6 +2471,27 @@ void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits) } while (--digits); } +// Draws a number with a set number of digits. +// Does not handle negative numbers in a special way, don't try to feed it any. +void V_DrawPaddedTallColorNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits, const UINT8 *colormap) +{ + INT32 w = SHORT(tallnum[0]->width); + + if (flags & V_NOSCALESTART) + w *= vid.dupx; + + if (num < 0) + num = -num; + + // draw the number + do + { + x -= w; + V_DrawFixedPatch(x<