From 0fc22e5fbde51a87fe7c3c2352108fbc1434fe95 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sun, 25 May 2025 00:58:50 -0700
Subject: [PATCH] Preserve spectatewait between maps

- Add spectatewait to G_PlayerReborn
- This was making shuffeloser not work
- Testing setup
  - `-server -splitscreen 4 +shuffleloser 1 +maxplayers 2 +numlaps 0 +debugstart 0 +inttime 0 +advancemap random`
  - Spectate two players, go to map
---
 src/g_game.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/g_game.c b/src/g_game.c
index 03af98262..a75134f5b 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2262,6 +2262,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 	INT32 kickstartaccel;
 	INT32 checkpointId;
 	boolean enteredGame;
+	tic_t spectatewait;
 	UINT8 lastsafelap;
 	UINT8 lastsafecheatcheck;
 	UINT16 bigwaypointgap;
@@ -2551,6 +2552,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 	checkpointId = players[player].checkpointId;
 
 	enteredGame = players[player].enteredGame;
+	spectatewait = players[player].spectatewait;
 
 	p = &players[player];
 	memset(p, 0, sizeof (*p));
@@ -2624,6 +2626,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 	p->karthud[khud_fault] = khudfault;
 	p->kickstartaccel = kickstartaccel;
 	p->checkpointId = checkpointId;
+	p->spectatewait = spectatewait;
 
 	p->ringvolume = 255;
 	p->ringtransparency = 255;