From 71f35c7f5b7cea1fbc86d8699eb52088bde02735 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Sat, 10 Aug 2019 02:07:18 -0400
Subject: [PATCH] Add encore_towhite

---
 src/dehacked.c | 2 ++
 src/f_finale.h | 1 +
 src/f_wipe.c   | 1 +
 src/p_setup.c  | 2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 62d99bfe1..a1330343b 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -3319,6 +3319,8 @@ static void readwipes(MYFILE *f)
 				pword = word + 7;
 				if (fastcmp(pword, "TOINVERT"))
 					wipeoffset = wipe_encore_toinvert;
+				else if (fastcmp(pword, "TOWHITE"))
+					wipeoffset = wipe_encore_towhite;
 			}
 
 			if (wipeoffset < 0)
diff --git a/src/f_finale.h b/src/f_finale.h
index d2231b8d0..d1efa6ce2 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -95,6 +95,7 @@ enum
 
 	// Specialized wipes
 	wipe_encore_toinvert,
+	wipe_encore_towhite,
 
 	// "From black" wipes
 	wipe_level_final,
diff --git a/src/f_wipe.c b/src/f_wipe.c
index e6d961c4d..c4064eec5 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -63,6 +63,7 @@ UINT8 wipedefs[NUMWIPEDEFS] = {
 	99, // wipe_cutscene_toblack (hardcoded)
 
 	72, // wipe_encore_toinvert
+	99, // wipe_encore_towhite
 
 	UINT8_MAX, // wipe_level_final
 	0,  // wipe_intermission_final
diff --git a/src/p_setup.c b/src/p_setup.c
index e40602039..4452dfe4c 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2889,7 +2889,7 @@ boolean P_SetupLevel(boolean skipprecip)
 		V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 0);
 		F_WipeEndScreen();
 
-		F_RunWipe(99, false, "FADEMAP1", false, true); // wiggle the screen during this!
+		F_RunWipe(wipedefs[wipe_encore_towhite], false, "FADEMAP1", false, true); // wiggle the screen during this!
 
 		// THEN fade to a black screen.
 		F_WipeStartScreen();