From e1b0ad3eafafe7ea78c8d430391bc029df74e2d6 Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 15 May 2023 20:38:59 +0100 Subject: [PATCH 1/2] K_DrawKartMinimap: Fix ghosts not being drawn properly Check for progressionbar was being accidentially inverted --- src/k_hud.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_hud.c b/src/k_hud.c index a278225dc..ca1adb285 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -3695,7 +3695,7 @@ static void K_drawKartMinimap(void) localplayers[i] = -1; // Player's tiny icons on the Automap. (drawn opposite direction so player 1 is drawn last in splitscreen) - if (ghosts && doprogressionbar == true) // future work: show ghosts on progression bar + if (ghosts && doprogressionbar == false) // future work: show ghosts on progression bar { demoghost *g = ghosts; while (g) From e40921bf0dcf45a0c60951b1ec76b82debf419fe Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 15 May 2023 20:51:25 +0100 Subject: [PATCH 2/2] 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 {