From 3c04951375e1445a673578acbfd78e3553ceb255 Mon Sep 17 00:00:00 2001 From: toaster Date: Thu, 31 Aug 2023 22:00:39 +0100 Subject: [PATCH] GP Lives HUD: for 10 lives, use the small number from the position rankings Per VC discussion, the HUD was adjusted without consideration for negative rings, so preserve the feng shui it was designed around --- src/k_hud.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index 6d02327fe..f7b2ee8c9 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -2736,9 +2736,16 @@ static void K_drawRingCounter(boolean gametypeinfoshown) if (uselives) { UINT8 *colormap = R_GetTranslationColormap(stplyr->skin, stplyr->skincolor, GTC_CACHE); - V_DrawMappedPatch(LAPS_X+40, fy-5, V_HUDTRANS|V_SLIDEIN|splitflags, faceprefix[stplyr->skin][FACE_RANK], colormap); - if (stplyr->lives >= 0) - K_DrawLivesDigits(LAPS_X + (stplyr->lives < 10 ? 60 : 57), fy, 6, V_HUDTRANS|V_SLIDEIN|splitflags, kp_facenum); + V_DrawMappedPatch(LAPS_X+46, fy-5, V_HUDTRANS|V_SLIDEIN|splitflags, faceprefix[stplyr->skin][FACE_RANK], colormap); + SINT8 livescount = 0; + if (stplyr->lives > 0) + { + livescount = stplyr->lives; + if (livescount > 10) + livescount = 10; + } + //K_DrawLivesDigits -- not using this because it messed with the FENG SHUI + V_DrawScaledPatch(LAPS_X+63, fy, V_HUDTRANS|V_SLIDEIN|splitflags, kp_facenum[livescount]); } } }