From 63f6b18d59c9f9e719710a319a3a63dd6f3bc4f8 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Mon, 12 Dec 2022 11:55:28 -0500
Subject: [PATCH] No user for roulette itemlist

Fixes the occasional Z_Free complaint
---
 src/k_roulette.c | 9 ++++-----
 src/p_saveg.c    | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/k_roulette.c b/src/k_roulette.c
index f154e261e..2a62bf7df 100644
--- a/src/k_roulette.c
+++ b/src/k_roulette.c
@@ -730,16 +730,15 @@ static void K_InitRoulette(itemroulette_t *const roulette)
 		roulette->itemList = Z_Calloc(
 			sizeof(SINT8) * roulette->itemListCap,
 			PU_LEVEL,
-			&roulette->itemList
+			NULL
 		);
 	}
 
-	memset(roulette->itemList, KITEM_NONE, sizeof(SINT8) * roulette->itemListCap);
 	roulette->itemListLen = 0;
-
 	roulette->index = 0;
+
 	roulette->elapsed = 0;
-	roulette->tics = roulette->speed = 3; // Some default speed
+	roulette->tics = roulette->speed = ROULETTE_SPEED_FASTEST; // Some default speed
 	roulette->active = true;
 	roulette->eggman = false;
 }
@@ -755,7 +754,7 @@ static void K_PushToRouletteItemList(itemroulette_t *const roulette, kartitems_t
 			roulette->itemList,
 			sizeof(SINT8) * roulette->itemListCap,
 			PU_LEVEL,
-			&roulette->itemList
+			NULL
 		);
 	}
 
diff --git a/src/p_saveg.c b/src/p_saveg.c
index fee092df9..0587b96f8 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -730,7 +730,7 @@ static void P_NetUnArchivePlayers(void)
 			players[i].itemRoulette.itemList = Z_Calloc(
 				sizeof(SINT8) * players[i].itemRoulette.itemListCap,
 				PU_LEVEL,
-				&players[i].itemRoulette.itemList
+				NULL
 			);
 		}
 		else
@@ -739,7 +739,7 @@ static void P_NetUnArchivePlayers(void)
 				players[i].itemRoulette.itemList,
 				sizeof(SINT8) * players[i].itemRoulette.itemListCap,
 				PU_LEVEL,
-				&players[i].itemRoulette.itemList
+				NULL
 			);
 		}