From 34b027e8ba7457f595b685c695572a48f180e347 Mon Sep 17 00:00:00 2001
From: Sally Cochenour <tehrealsalt@gmail.com>
Date: Wed, 30 Jan 2019 15:57:46 -0500
Subject: [PATCH] Shift around flashing bump stuff

---
 src/k_kart.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 9a8adb22..850b703a 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1068,19 +1068,24 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
 		|| (mobj2->player && mobj2->player->kartstuff[k_respawn]))
 		return;
 
-	// Don't bump if you're flashing
-	if (mobj1->player && mobj1->player->powers[pw_flashing] > 0
-		&& mobj1->player->powers[pw_flashing] < K_GetKartFlashing(mobj1->player)-1)
-	{
-		mobj1->player->powers[pw_flashing]++;
-		return;
-	}
+	{ // Don't bump if you're flashing
+		INT32 flash;
 
-	if (mobj2->player && mobj2->player->powers[pw_flashing] > 0
-		&& mobj2->player->powers[pw_flashing] < K_GetKartFlashing(mobj2->player)-1)
-	{
-		mobj2->player->powers[pw_flashing]++;
-		return;
+		flash = K_GetKartFlashing(mobj1->player);
+		if (mobj1->player && mobj1->player->powers[pw_flashing] > 0 && mobj1->player->powers[pw_flashing] < flash)
+		{
+			if (mobj1->player->powers[pw_flashing] < flash-1)
+				mobj1->player->powers[pw_flashing]++;
+			return;
+		}
+
+		flash = K_GetKartFlashing(mobj2->player);
+		if (mobj2->player && mobj2->player->powers[pw_flashing] > 0 && mobj2->player->powers[pw_flashing] < flash)
+		{
+			if (mobj2->player->powers[pw_flashing] < flash-1)
+				mobj2->player->powers[pw_flashing]++;
+			return;
+		}
 	}
 
 	// Don't bump if you've recently bumped