From 45ee50b47d02fd64e64c8f6c2ae475e538ed22e6 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 28 Oct 2025 01:21:26 +0100 Subject: [PATCH] remove reduntant stuff from D_ClearState and G_StopDemo we only need R_ExecuteSetViewSize from splitscreen_onchange, the rest doesent do anything due to SV_StopServer call earlier setting cl_mode to CL_ABORTED SV_StopServer also calls Y_EndIntermission and Y_EndVote if necessary --- src/d_main.c | 22 +++------------------- src/g_demo.c | 5 ----- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index d4cef24c3..ca2ffa4f7 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -954,24 +954,6 @@ void D_SRB2Loop(void) // D_SRB2Main // ========================================================================= -static void ResetSplitScreen(void) -{ - UINT8 i; - - // recompute screen size - R_ExecuteSetViewSize(); - - if (!demo.playback && !botingame) - { - for (i = 1; i < MAXSPLITSCREENPLAYERS; i++) - { - if (i > splitscreen) - CL_RemoveSplitscreenPlayer(displayplayers[i]); - else - CL_AddSplitscreenPlayer(); - } - } -} // // D_ClearState // @@ -992,7 +974,9 @@ void D_ClearState(void) CL_ClearPlayer(i); splitscreen = 0; - ResetSplitScreen(); // splitscreen onchange resets us to singleplayer :chaosleep: + + // recompute screen size + R_ExecuteSetViewSize(); botingame = false; botskin = 0; diff --git a/src/g_demo.c b/src/g_demo.c index 96ff33e65..bd3905160 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -3494,11 +3494,6 @@ void G_StopDemo(void) demo.rewinding = false; CL_ClearRewinds(); - if (gamestate == GS_INTERMISSION) - Y_EndIntermission(); // cleanup - if (gamestate == GS_VOTING) - Y_EndVote(); - D_ClearState(); }