From 772ad54efc77b8b7cae05eef79058e0925cb5c48 Mon Sep 17 00:00:00 2001
From: minenice55 <star.elementa@gmail.com>
Date: Sat, 24 Jan 2026 15:44:33 -0500
Subject: [PATCH] fix swapping skins mid-game removing restat

---
 src/r_skins.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/r_skins.c b/src/r_skins.c
index ee9f9e3ba..6f2fc4e24 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -616,8 +616,16 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
 
 		player->followitem = skin->followitem;
 
-		player->kartspeed = skin->kartspeed;
-		player->kartweight = skin->kartweight;
+		if (player->kartspeedrestat != 0 || player->kartweightrestat != 0)
+		{
+			player->kartspeed = player->kartspeedrestat;
+			player->kartweight = player->kartweightrestat;
+		}
+		else
+		{
+			player->kartspeed = skin->kartspeed;
+			player->kartweight = skin->kartweight;
+		}
 
 #if 0
 		if (!(cht_debug || devparm) && !(netgame || multiplayer || demo.playback))