Merge branch 'fix-replay-splits' into 'master'

Fix splitscreen viewport and delay counter carrying over from replays into play contexts

Closes #464

See merge request KartKrew/Kart!1902
This commit is contained in:
Oni 2024-02-06 13:21:13 +00:00
commit 3a4506dae2
2 changed files with 6 additions and 10 deletions

View file

@ -3313,6 +3313,11 @@ void SV_ResetServer(void)
memset(playeringame, false, sizeof playeringame); memset(playeringame, false, sizeof playeringame);
memset(playernode, UINT8_MAX, sizeof playernode); memset(playernode, UINT8_MAX, sizeof playernode);
pingmeasurecount = 1;
memset(realpingtable, 0, sizeof realpingtable);
memset(playerpingtable, 0, sizeof playerpingtable);
memset(playerpacketlosstable, 0, sizeof playerpacketlosstable);
ClearAdminPlayers(); ClearAdminPlayers();
Schedule_Clear(); Schedule_Clear();
Automate_Clear(); Automate_Clear();

View file

@ -3759,16 +3759,7 @@ void G_StopDemo(void)
Z_Free(demo.skinlist); Z_Free(demo.skinlist);
demo.skinlist = NULL; demo.skinlist = NULL;
if (gamestate == GS_INTERMISSION) D_ClearState();
Y_EndIntermission(); // cleanup
if (gamestate == GS_VOTING)
Y_EndVote();
G_SetGamestate(GS_NULL);
wipegamestate = GS_NULL;
SV_StopServer();
SV_ResetServer();
} }
boolean G_CheckDemoStatus(void) boolean G_CheckDemoStatus(void)