From 900f7e3dc9e23e9e0df64aebe2b228b9c3e5721c Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sun, 25 Nov 2018 19:31:22 -0500
Subject: [PATCH] FORCEWIPEOFF define in place of wipegamestate = -2
---
src/d_main.c | 4 ++--
src/f_finale.h | 1 +
src/p_setup.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/d_main.c b/src/d_main.c
index 989204e1fa..6ee78cabb0 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -288,7 +288,7 @@ static void D_Display(void)
{
// Fade to black first
if ((wipegamestate == (gamestate_t)FORCEWIPE ||
- (wipegamestate != (gamestate_t)-2
+ (wipegamestate != (gamestate_t)FORCEWIPEOFF
&& !(gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction)))
) // fades to black on its own timing, always
&& wipetypepre != UINT8_MAX)
@@ -374,7 +374,7 @@ static void D_Display(void)
// STUPID race condition...
if (wipegamestate == GS_INTRO && gamestate == GS_TITLESCREEN)
- wipegamestate = -2;
+ wipegamestate = FORCEWIPEOFF;
else
{
wipegamestate = gamestate;
diff --git a/src/f_finale.h b/src/f_finale.h
index 27ece47c93..18c032ba68 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -102,6 +102,7 @@ void F_MenuPresTicker(boolean run);
//
// HACK for menu fading while titlemapinaction; skips the level check
#define FORCEWIPE -3
+#define FORCEWIPEOFF -2
extern boolean WipeInAction;
extern INT32 lastwipetic;
diff --git a/src/p_setup.c b/src/p_setup.c
index f7d51ad0fe..9686585bb8 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2729,7 +2729,7 @@ boolean P_SetupLevel(boolean skipprecip)
players[consoleplayer].viewz = 1;
// Cancel all d_main.c fadeouts (keep fade in though).
- wipegamestate = -2;
+ wipegamestate = FORCEWIPEOFF;
// Special stage fade to white
// This is handled BEFORE sounds are stopped.
--
GitLab