From 6d15fc1ce4ed7bac48c49c629ee3590dd3c78011 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 18 Apr 2025 10:09:42 +0200 Subject: [PATCH 1/5] close menus when replay stops --- src/g_game.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/g_game.c b/src/g_game.c index 54e509be6..6de3b1c20 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -8044,6 +8044,8 @@ void G_StopDemo(void) if (gamestate == GS_VOTING) Y_EndVote(); + M_ClearMenus(true); + G_SetGamestate(GS_NULL); wipegamestate = GS_NULL; SV_StopServer(); From c4fd47657ee979d9f226264cef9569cf8c04b0ab Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 18 Apr 2025 11:11:36 +0200 Subject: [PATCH 2/5] fix crash when using connect command from within replays --- src/d_clisrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 07cb54ecd..7927f7b28 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -3167,9 +3167,9 @@ static void Command_connect(void) M_ClearMenus(true); - if (Playing() || demo.title) + if (Playing() || demo.title || demo.playback) { - if (demo.title) + if (demo.title || demo.playback) G_CheckDemoStatus(); if (netgame) From 963eb427cf05d47a1d275f0faafea49848ee2ffc Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 18 Apr 2025 11:20:17 +0200 Subject: [PATCH 3/5] reset demo stuff for multiplayer demos when using connect command so if smth happens and we cannot connect the game wont be stuck in some weird replay limbo state --- src/d_clisrv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 7927f7b28..c22400717 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -3170,7 +3170,11 @@ static void Command_connect(void) if (Playing() || demo.title || demo.playback) { if (demo.title || demo.playback) + { G_CheckDemoStatus(); + if (multiplayer && !demo.title) // dumb hack: G_CheckDemoStatus doesent call G_StopDemo for multiplayer demos + G_StopDemo(); + } if (netgame) { From 08f208e4a01e57629c89da81ccc00fb1442cb064 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 18 Apr 2025 11:20:58 +0200 Subject: [PATCH 4/5] fix record attack condition in G_CheckDemoStatus --- src/g_game.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 6de3b1c20..89917b268 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -8017,7 +8017,7 @@ void G_StopDemo(void) demobuf.buffer = NULL; demo.playback = false; if (demo.title) - modeattacking = false; + modeattacking = ATTACKING_NONE; demo.title = false; demo.timing = false; singletics = false; @@ -8088,12 +8088,16 @@ boolean G_CheckDemoStatus(void) I_Quit(); if (multiplayer && !demo.title) + { G_ExitLevel(); + } else { + UINT8 wasmodeattacking = modeattacking; + G_StopDemo(); - if (modeattacking) + if (wasmodeattacking) M_EndModeAttackRun(); else D_StartTitle(); From 8943b6a3b7cbb798f44c5c17fada141bfaa8b96a Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 18 Apr 2025 11:29:42 +0200 Subject: [PATCH 5/5] reset record attack state in G_ResetDemoPlayback should fix some wonky issues in a few cases --- src/g_game.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/g_game.c b/src/g_game.c index 89917b268..5fdbbd231 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -8136,6 +8136,8 @@ static void G_ResetDemoPlayback(char *pdemoname) Z_Free(demobuf.buffer); demobuf.buffer = NULL; demo.playback = false; + if (demo.title) + modeattacking = ATTACKING_NONE; demo.title = false; }