From 9e5b70ad8fbd62bfff0bce29e288840850dffd55 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Wed, 5 Jan 2022 03:17:38 -0500
Subject: [PATCH] No flashing tics in Battle

---
 src/k_kart.c | 11 +++++++++--
 src/p_user.c |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 53426531a..255dff396 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2962,11 +2962,18 @@ UINT16 K_GetKartFlashing(player_t *player)
 {
 	UINT16 tics = flashingtics;
 
-	if (!player)
+	if (gametype == GT_BATTLE)
+	{
+		// TODO: gametyperules
+		return 1;
+	}
+
+	if (player == NULL)
+	{
 		return tics;
+	}
 
 	tics += (tics/8) * (player->kartspeed);
-
 	return tics;
 }
 
diff --git a/src/p_user.c b/src/p_user.c
index f8d556a6b..70fb23a08 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4555,7 +4555,7 @@ void P_PlayerThink(player_t *player)
 		|| (player->pflags & PF_NOCONTEST) // NO CONTEST explosion
 		|| ((gametyperules & GTR_BUMPERS) && player->bumpers <= 0 && player->karmadelay)))
 	{
-		if (player->flashing > 0 && player->flashing < K_GetKartFlashing(player)
+		if (player->flashing > 1 && player->flashing < K_GetKartFlashing(player)
 			&& (leveltime & 1))
 			player->mo->renderflags |= RF_DONTDRAW;
 		else