From 2a30fc365fc00227b4569b5a568f90b6161b07db Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Fri, 5 Jun 2020 19:29:00 -0400
Subject: [PATCH] Fix totalring/xtralife getting reset

---
 src/g_game.c  | 3 +++
 src/p_setup.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/g_game.c b/src/g_game.c
index 698a548db..ca3fc4a9e 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2596,6 +2596,7 @@ void G_PlayerReborn(INT32 player)
 	UINT8 botdiffincrease;
 	boolean botrival;
 	SINT8 pity;
+	SINT8 xtralife;
 
 	// SRB2kart
 	respawnvars_t respawn;
@@ -2646,6 +2647,7 @@ void G_PlayerReborn(INT32 player)
 	botdiffincrease = players[player].botvars.diffincrease;
 	botrival = players[player].botvars.rival;
 	pity = players[player].pity;
+	xtralife = players[player].xtralife;
 
 	// SRB2kart
 	if (leveltime <= starttime)
@@ -2726,6 +2728,7 @@ void G_PlayerReborn(INT32 player)
 	p->botvars.diffincrease = botdiffincrease;
 	p->botvars.rival = botrival;
 	p->pity = pity;
+	p->xtralife = xtralife;
 
 	// SRB2kart
 	p->kartstuff[k_itemroulette] = itemroulette;
diff --git a/src/p_setup.c b/src/p_setup.c
index cbaef63b4..1071f5da3 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2431,7 +2431,7 @@ static void P_LevelInitStuff(void)
 		players[i].lostlife = false;
 		players[i].gotcontinue = false;
 
-		players[i].deadtimer = players[i].numboxes = players[i].totalring = players[i].laps = 0;
+		players[i].deadtimer = players[i].numboxes = players[i].laps = 0;
 		players[i].health = 1;
 		players[i].aiming = 0;
 		players[i].pflags &= ~PF_TIMEOVER;