From 167df6cca7bba1e00342cdf1536ce483b29dc0a7 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Thu, 15 Dec 2022 01:44:09 -0500
Subject: [PATCH] Remove item roulette between maps

---
 src/g_game.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 91d309638..ab4b6bc9c 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2322,8 +2322,13 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 	pflags = (players[player].pflags & (PF_WANTSTOJOIN|PF_KICKSTARTACCEL|PF_SHRINKME|PF_SHRINKACTIVE));
 
 	// SRB2kart
+	memcpy(&itemRoulette, &players[player].itemRoulette, sizeof (itemRoulette));
+	memcpy(&respawn, &players[player].respawn, sizeof (respawn));
+
 	if (betweenmaps || leveltime < introtime)
 	{
+		itemRoulette.active = false;
+
 		itemtype = 0;
 		itemamount = 0;
 		growshrinktimer = 0;
@@ -2400,9 +2405,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 		P_SetTarget(&players[player].follower, NULL);
 	}
 
-	memcpy(&itemRoulette, &players[player].itemRoulette, sizeof (itemRoulette));
-	memcpy(&respawn, &players[player].respawn, sizeof (respawn));
-
 	p = &players[player];
 	memset(p, 0, sizeof (*p));