From 86813b96a3cceea936cd9a5f0016fa7ba1719de8 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 23 Nov 2022 18:11:50 +0000
Subject: [PATCH] Adjust how properties are handled in G_PlayerReborn a little.

For consistency, all conditionals are done when data is being preserved in local variables, not on write back to player struct.
---
 src/g_game.c | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 5e722fe4f..7dd33fec3 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2286,12 +2286,22 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 
 	skincolor = players[player].skincolor;
 	skin = players[player].skin;
-	fakeskin = players[player].fakeskin;
-	lastfakeskin = players[player].lastfakeskin;
 
-	// SRB2kart
-	kartspeed = players[player].kartspeed;
-	kartweight = players[player].kartweight;
+	if (betweenmaps)
+	{
+		fakeskin = MAXSKINS;
+		kartspeed = skins[players[player].skin].kartspeed;
+		kartweight = skins[players[player].skin].kartweight;
+		charflags = skins[players[player].skin].flags;
+	}
+	else
+	{
+		fakeskin = players[player].fakeskin;
+		kartspeed = players[player].kartspeed;
+		kartweight = players[player].kartweight;
+		charflags = players[player].charflags;
+	}
+	lastfakeskin = players[player].lastfakeskin;
 
 	followerready = players[player].followerready;
 	followercolor = players[player].followercolor;
@@ -2299,8 +2309,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 
 	availabilities = players[player].availabilities;
 
-	charflags = players[player].charflags;
-
 	followitem = players[player].followitem;
 
 	bot = players[player].bot;
@@ -2417,10 +2425,13 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 	// save player config truth reborn
 	p->skincolor = skincolor;
 	p->skin = skin;
+
+	p->fakeskin = fakeskin;
 	p->kartspeed = kartspeed;
 	p->kartweight = kartweight;
-	//
 	p->charflags = charflags;
+	p->lastfakeskin = lastfakeskin;
+
 	p->availabilities = availabilities;
 	p->followitem = followitem;
 
@@ -2441,19 +2452,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 	p->botvars.rival = botrival;
 	p->xtralife = xtralife;
 
-	if (betweenmaps) 
-	{
-		p->fakeskin = MAXSKINS;
-		p->kartspeed = skins[p->skin].kartspeed;
-		p->kartweight = skins[p->skin].kartweight;
-	}
-	else 
-	{
-		p->fakeskin = fakeskin;
-	}
-
-	p->lastfakeskin = lastfakeskin;
-
 	// SRB2kart
 	p->itemroulette = itemroulette;
 	p->roulettetype = roulettetype;