From 5ee0e0d8c6e8d1abc7b3f85347bec480474715c8 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Tue, 12 Aug 2025 22:50:43 -0400 Subject: [PATCH] Prevent input during intro wipes to visual errors If you press a button to skip during a wipe it turns fully white / black on the spot making it look really ugly --- src/d_main.cpp | 4 ++-- src/g_game.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 8473033a2..c9014b61e 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -679,7 +679,7 @@ dedipostwipe: if (rendermode != render_none) F_WipeEndScreen(); - F_RunWipe(wipetypepost, gamestate != GS_TIMEATTACK); + F_RunWipe(wipetypepost, gamestate != GS_TIMEATTACK && gamestate != GS_INTRO); // reset counters so timedemo doesn't count the wipe duration if (demo.timing) @@ -851,7 +851,7 @@ void D_WipeLoop(wipelooptype_t type, UINT8 wipetype, boolean drawMenu) nowtime = lastwipetic = I_GetTime(); endtime = nowtime + endtimes[type]; - if (gamestate != GS_TITLESCREEN && gamestate != GS_TIMEATTACK) + if (gamestate != GS_TITLESCREEN && gamestate != GS_TIMEATTACK && gamestate != GS_INTRO) drawMenu = true; WipeInAction = 1 + !drawMenu; diff --git a/src/g_game.c b/src/g_game.c index 9f845cf56..d0a3c5ce3 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1577,7 +1577,7 @@ boolean G_Responder(event_t *ev) // Intro else if (gamestate == GS_INTRO) { - if (F_IntroResponder(ev)) + if (F_IntroResponder(ev) && !WipeInAction) { D_StartTitle(); return true;