From 272362a86f38ee85a7f86c3615cba4ccd13d1546 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sat, 23 May 2020 22:47:30 -0400
Subject: [PATCH] Fix NOWIPE bugs with colormap fade and title card
---
src/f_wipe.c | 2 ++
src/g_game.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/f_wipe.c b/src/f_wipe.c
index 940b61c447..01b45b0c29 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -614,6 +614,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
tic_t F_GetWipeLength(UINT8 wipetype)
{
#ifdef NOWIPE
+ (void)wipetype;
return 0;
#else
static char lumpname[10] = "FADEmmss";
@@ -640,6 +641,7 @@ tic_t F_GetWipeLength(UINT8 wipetype)
boolean F_WipeExists(UINT8 wipetype)
{
#ifdef NOWIPE
+ (void)wipetype;
return false;
#else
static char lumpname[10] = "FADEmm00";
diff --git a/src/g_game.c b/src/g_game.c
index 92d71fbaeb..2f3ba9867c 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1866,6 +1866,7 @@ void G_StartTitleCard(void)
//
void G_PreLevelTitleCard(void)
{
+#ifndef NOWIPE
tic_t starttime = I_GetTime();
tic_t endtime = starttime + (PRELEVELTIME*NEWTICRATERATIO);
tic_t nowtime = starttime;
@@ -1888,6 +1889,7 @@ void G_PreLevelTitleCard(void)
}
if (!cv_showhud.value)
wipestyleflags = WSF_CROSSFADE;
+#endif
}
static boolean titlecardforreload = false;
--
GitLab