From e82082fd066d56fd917d6e9a471e4207d1da1304 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 7 Apr 2023 00:51:28 +0100 Subject: [PATCH] K_UpdateDistanceFromFinishLine: Do not destroy distancetofinish value if the player NO CONTESTed --- src/k_hud.c | 2 +- src/k_kart.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index 284ca4149..1b17024fa 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -1671,7 +1671,7 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, U INT32 widthbar = 120, xbar = 160 - widthbar/2, currentx; INT32 barflags = V_SNAPTOBOTTOM|V_SLIDEIN; - V_DrawScaledPatch(xbar, ybar - 2, barflags|minimaptrans, kp_wouldyoustillcatchmeifiwereaworm); + V_DrawScaledPatch(xbar, ybar - 2, barflags, kp_wouldyoustillcatchmeifiwereaworm); V_DrawMappedPatch(160 + widthbar/2 - 7, ybar - 7, barflags, faceprefix[stplyr->skin][FACE_MINIMAP], colormap); diff --git a/src/k_kart.c b/src/k_kart.c index 48f1afaa8..571d1587b 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -8592,11 +8592,16 @@ void K_UpdateDistanceFromFinishLine(player_t *const player) } // nextwaypoint is now the waypoint that is in front of us - if (player->exiting || player->spectator) + if ((player->exiting && !(player->pflags & PF_NOCONTEST)) || player->spectator) { // Player has finished, we don't need to calculate this player->distancetofinish = 0U; } + else if (player->pflags & PF_NOCONTEST) + { + // We also don't need to calculate this, but there's also no need to destroy the data... + ; + } else if ((player->currentwaypoint != NULL) && (player->nextwaypoint != NULL) && (finishline != NULL)) { const boolean useshortcuts = false;