From 05f08ef5cb0990b458a935d94631e01d49152098 Mon Sep 17 00:00:00 2001
From: GenericHeroGuy <genericheroguy@noreply.codeberg.org>
Date: Sat, 29 Mar 2025 00:04:16 +0100
Subject: [PATCH] Set WipeInAction in D_WipeLoop, don't run
 scoreboard/cecho/etc during wipes

---
 src/d_main.cpp | 4 ++++
 src/f_wipe.c   | 3 ---
 src/hu_stuff.c | 6 ++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index c40103d56..adbe747cd 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -849,6 +849,8 @@ void D_WipeLoop(wipelooptype_t type, UINT8 wipetype, boolean drawMenu)
 	if (gamestate != GS_TITLESCREEN && gamestate != GS_TIMEATTACK)
 		drawMenu = true;
 
+	WipeInAction = true;
+
 	// lastwipetic should either be 0 or the tic we last wiped
 	// on for fade-to-black
 	while (nowtime < endtime)
@@ -906,6 +908,8 @@ void D_WipeLoop(wipelooptype_t type, UINT8 wipetype, boolean drawMenu)
 		delta = D_EndFrame(enterprecise, NULL);
 		lastwipetic = nowtime;
 	}
+
+	WipeInAction = false;
 }
 
 // =========================================================================
diff --git a/src/f_wipe.c b/src/f_wipe.c
index f52ca8d55..a048be0f6 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -362,12 +362,9 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
 	paldiv = FixedDiv(257<<FRACBITS, 11<<FRACBITS);
 
 	// Init the wipe
-	WipeInAction = true;
 	wipe_scr = screens[0];
 
 	D_WipeLoop(WIPELOOP_RUNWIPE, wipetype, drawMenu);
-
-	WipeInAction = false;
 #endif
 }
 
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 4bd25c826..ff71e987f 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -1083,6 +1083,9 @@ void HU_Ticker(void)
 		}
 	}
 
+	if (WipeInAction)
+		return;
+
 	if (cechotimer)
 		cechotimer--;
 
@@ -2136,6 +2139,9 @@ void HU_Drawer(void)
 			HU_drawMiniChat(); // draw messages in a cool fashion.
 	}
 
+	if (WipeInAction)
+		return;
+
 	if (cechotimer)
 		HU_DrawCEcho();