Merge branch 'jartha/fix-spectatewait' into 'master'

Preserve spectatewait between maps

Closes #1531

See merge request kart-krew-dev/ring-racers-internal!2575
This commit is contained in:
Oni VelocitOni 2025-05-25 19:35:28 +00:00
commit 8282dcf0c8

View file

@ -2262,6 +2262,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
INT32 kickstartaccel; INT32 kickstartaccel;
INT32 checkpointId; INT32 checkpointId;
boolean enteredGame; boolean enteredGame;
tic_t spectatewait;
UINT8 lastsafelap; UINT8 lastsafelap;
UINT8 lastsafecheatcheck; UINT8 lastsafecheatcheck;
UINT16 bigwaypointgap; UINT16 bigwaypointgap;
@ -2551,6 +2552,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
checkpointId = players[player].checkpointId; checkpointId = players[player].checkpointId;
enteredGame = players[player].enteredGame; enteredGame = players[player].enteredGame;
spectatewait = players[player].spectatewait;
p = &players[player]; p = &players[player];
memset(p, 0, sizeof (*p)); memset(p, 0, sizeof (*p));
@ -2624,6 +2626,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
p->karthud[khud_fault] = khudfault; p->karthud[khud_fault] = khudfault;
p->kickstartaccel = kickstartaccel; p->kickstartaccel = kickstartaccel;
p->checkpointId = checkpointId; p->checkpointId = checkpointId;
p->spectatewait = spectatewait;
p->ringvolume = 255; p->ringvolume = 255;
p->ringtransparency = 255; p->ringtransparency = 255;