From 75b7d4bc42bcf8c8f202ada251cdd0bef266ce36 Mon Sep 17 00:00:00 2001 From: SteelT Date: Mon, 1 Apr 2024 18:04:19 -0400 Subject: [PATCH] Don't draw OpenGL loading screen when resynching the gamestate --- src/hardware/hw_bsp.c | 2 +- src/p_setup.cpp | 2 ++ src/p_setup.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c index 6db5a3319..5b0f688d5 100644 --- a/src/hardware/hw_bsp.c +++ b/src/hardware/hw_bsp.c @@ -584,7 +584,7 @@ static void loading_status(void) char s[16]; int x, y; - if ((gamestate == GS_TITLESCREEN && titlemapinaction) || demo.attract == DEMO_ATTRACT_CREDITS) + if ((gamestate == GS_TITLESCREEN && titlemapinaction) || demo.attract == DEMO_ATTRACT_CREDITS || g_reloadinggamestate) { return; } diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 78927211b..f63e1451c 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -126,6 +126,7 @@ #include extern "C" consvar_t cv_continuousmusic; +boolean g_reloadinggamestate = false; // // Map MD5, calculated on level load. @@ -8329,6 +8330,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) virtlump_t *encoreLump = NULL; levelloading = true; + g_reloadinggamestate = reloadinggamestate; // This is needed. Don't touch. maptol = mapheaderinfo[gamemap-1]->typeoflevel; diff --git a/src/p_setup.h b/src/p_setup.h index 3f09939e5..b3aca68f2 100644 --- a/src/p_setup.h +++ b/src/p_setup.h @@ -32,6 +32,7 @@ extern mapthing_t *deathmatchstarts[MAX_DM_STARTS]; extern INT32 numdmstarts, numcoopstarts, numredctfstarts, numbluectfstarts, numfaultstarts; extern boolean levelloading; +extern boolean g_reloadinggamestate; extern UINT8 levelfadecol; extern tic_t oldbest;