From e40921bf0dcf45a0c60951b1ec76b82debf419fe Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 15 May 2023 20:51:25 +0100 Subject: [PATCH] K_drawKartMinimap: When the player NO CONTESTs: - If the player's MT_KART_LEFTOVER is being followed instead of their flung corpse - Flicker with the object. - Else, don't draw anything Fixes the teleporting corpse minimap tracking when you NO CONTEST. --- src/k_hud.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index ca1adb285..a0e91b9eb 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -3754,11 +3754,20 @@ static void K_drawKartMinimap(void) if (mobj->health <= 0 && (players[i].pflags & PF_NOCONTEST)) { + if (P_MobjWasRemoved(mobj->tracer)) + { + continue; + } + + if (mobj->tracer->renderflags & RF_DONTDRAW) + { + continue; + } + workingPic = kp_nocontestminimap; colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE); - if (mobj->tracer && !P_MobjWasRemoved(mobj->tracer)) - mobj = mobj->tracer; + mobj = mobj->tracer; } else { @@ -3923,11 +3932,20 @@ static void K_drawKartMinimap(void) if (mobj->health <= 0 && (players[localplayers[i]].pflags & PF_NOCONTEST)) { + if (P_MobjWasRemoved(mobj->tracer)) + { + continue; + } + + if (mobj->tracer->renderflags & RF_DONTDRAW) + { + continue; + } + workingPic = kp_nocontestminimap; colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE); - if (mobj->tracer && !P_MobjWasRemoved(mobj->tracer)) - mobj = mobj->tracer; + mobj = mobj->tracer; } else {