From ecfa973e6bc62189a4fabba372ec7680286fe452 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 25 Nov 2025 19:19:17 +0100 Subject: [PATCH] move M_ResetDemoList hack to G_InitNew --- src/g_game.c | 6 ++++++ src/p_setup.c | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index a02320f66..8960fc055 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -4007,6 +4007,12 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool automapactive = false; imcontinuing = false; + // HACK: this doesent reset if you change the map from within a replay and may cause crashes or the replayhut to be non functional + if (!demo.playback && demo.inreplayhut) + { + M_ResetDemoList(); + } + if (!skipprecutscene && mapheaderinfo[gamemap-1]->precutscenenum && !modeattacking) // Start a custom cutscene. F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer); else diff --git a/src/p_setup.c b/src/p_setup.c index 91a41abd2..75d8049f0 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2743,11 +2743,6 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) lumpnum_t encoreLump = LUMPERROR; UINT8 levelfadecol; - // HACK: this doesent reset if you change the map from within a replay and may cause crashes or the replayhut to be non functional - if (!demo.playback && demo.inreplayhut) - { - M_ResetDemoList(); - } midgamejoin = fromnetsave; // makes dynslopes run in P_Ticker to avoid synch issues and other stuff