From 5504cb8ceeb9d6fbdf6994f22c34922354563ab7 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sat, 24 Oct 2020 11:46:56 -0400
Subject: [PATCH] Don't show comeback timer & screen fade after you've been
 eliminated

---
 src/k_hud.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/k_hud.c b/src/k_hud.c
index b3ea7cd29..ff689f7f2 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -3904,11 +3904,12 @@ void K_drawKartHUD(void)
 		return;
 	}
 
-	battlefullscreen = ((gametype == GT_BATTLE)
+	battlefullscreen = ((gametyperules & (GTR_BUMPERS|GTR_KARMA)) == (GTR_BUMPERS|GTR_KARMA)
 		&& (stplyr->exiting
 		|| (stplyr->bumpers <= 0
-		&& stplyr->karmadelay
-		&& comeback
+		&& stplyr->karmadelay > 0
+		&& stplyr->eliminated == false
+		&& comeback == true
 		&& stplyr->playerstate == PST_LIVE)));
 
 	if (!demo.title && (!battlefullscreen || r_splitscreen))