Skip to content
Snippets Groups Projects
Commit 55428935 authored by SteelT's avatar SteelT
Browse files

Merge branch 'nowipe-fixes' into 'master'

NOWIPE fixes for colormap and title card wipes

See merge request STJr/SRB2!962
parents 9d06cb4b 272362a8
Branches
Tags
No related merge requests found
...@@ -162,7 +162,9 @@ extern wipestyleflags_t wipestyleflags; ...@@ -162,7 +162,9 @@ extern wipestyleflags_t wipestyleflags;
// Even my function names are borderline // Even my function names are borderline
boolean F_ShouldColormapFade(void); boolean F_ShouldColormapFade(void);
boolean F_TryColormapFade(UINT8 wipecolor); boolean F_TryColormapFade(UINT8 wipecolor);
#ifndef NOWIPE
void F_DecideWipeStyle(void); void F_DecideWipeStyle(void);
#endif
#define FADECOLORMAPDIV 8 #define FADECOLORMAPDIV 8
#define FADECOLORMAPROWS (256/FADECOLORMAPDIV) #define FADECOLORMAPROWS (256/FADECOLORMAPDIV)
......
...@@ -464,6 +464,7 @@ void F_WipeEndScreen(void) ...@@ -464,6 +464,7 @@ void F_WipeEndScreen(void)
*/ */
boolean F_ShouldColormapFade(void) boolean F_ShouldColormapFade(void)
{ {
#ifndef NOWIPE
if ((wipestyleflags & (WSF_FADEIN|WSF_FADEOUT)) // only if one of those wipestyleflags are actually set if ((wipestyleflags & (WSF_FADEIN|WSF_FADEOUT)) // only if one of those wipestyleflags are actually set
&& !(wipestyleflags & WSF_CROSSFADE)) // and if not crossfading && !(wipestyleflags & WSF_CROSSFADE)) // and if not crossfading
{ {
...@@ -479,11 +480,13 @@ boolean F_ShouldColormapFade(void) ...@@ -479,11 +480,13 @@ boolean F_ShouldColormapFade(void)
// Menus // Menus
|| gamestate == GS_TIMEATTACK); || gamestate == GS_TIMEATTACK);
} }
#endif
return false; return false;
} }
/** Decides what wipe style to use. /** Decides what wipe style to use.
*/ */
#ifndef NOWIPE
void F_DecideWipeStyle(void) void F_DecideWipeStyle(void)
{ {
// Set default wipe style // Set default wipe style
...@@ -493,6 +496,7 @@ void F_DecideWipeStyle(void) ...@@ -493,6 +496,7 @@ void F_DecideWipeStyle(void)
if (F_ShouldColormapFade()) if (F_ShouldColormapFade())
wipestyle = WIPESTYLE_COLORMAP; wipestyle = WIPESTYLE_COLORMAP;
} }
#endif
/** Attempt to run a colormap fade, /** Attempt to run a colormap fade,
provided all the conditionals were properly met. provided all the conditionals were properly met.
...@@ -501,6 +505,7 @@ void F_DecideWipeStyle(void) ...@@ -501,6 +505,7 @@ void F_DecideWipeStyle(void)
*/ */
boolean F_TryColormapFade(UINT8 wipecolor) boolean F_TryColormapFade(UINT8 wipecolor)
{ {
#ifndef NOWIPE
if (F_ShouldColormapFade()) if (F_ShouldColormapFade())
{ {
#ifdef HWRENDER #ifdef HWRENDER
...@@ -510,6 +515,7 @@ boolean F_TryColormapFade(UINT8 wipecolor) ...@@ -510,6 +515,7 @@ boolean F_TryColormapFade(UINT8 wipecolor)
return true; return true;
} }
else else
#endif
{ {
F_WipeColorFill(wipecolor); F_WipeColorFill(wipecolor);
return false; return false;
...@@ -608,6 +614,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu) ...@@ -608,6 +614,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
tic_t F_GetWipeLength(UINT8 wipetype) tic_t F_GetWipeLength(UINT8 wipetype)
{ {
#ifdef NOWIPE #ifdef NOWIPE
(void)wipetype;
return 0; return 0;
#else #else
static char lumpname[10] = "FADEmmss"; static char lumpname[10] = "FADEmmss";
...@@ -634,6 +641,7 @@ tic_t F_GetWipeLength(UINT8 wipetype) ...@@ -634,6 +641,7 @@ tic_t F_GetWipeLength(UINT8 wipetype)
boolean F_WipeExists(UINT8 wipetype) boolean F_WipeExists(UINT8 wipetype)
{ {
#ifdef NOWIPE #ifdef NOWIPE
(void)wipetype;
return false; return false;
#else #else
static char lumpname[10] = "FADEmm00"; static char lumpname[10] = "FADEmm00";
......
...@@ -1866,6 +1866,7 @@ void G_StartTitleCard(void) ...@@ -1866,6 +1866,7 @@ void G_StartTitleCard(void)
// //
void G_PreLevelTitleCard(void) void G_PreLevelTitleCard(void)
{ {
#ifndef NOWIPE
tic_t starttime = I_GetTime(); tic_t starttime = I_GetTime();
tic_t endtime = starttime + (PRELEVELTIME*NEWTICRATERATIO); tic_t endtime = starttime + (PRELEVELTIME*NEWTICRATERATIO);
tic_t nowtime = starttime; tic_t nowtime = starttime;
...@@ -1888,6 +1889,7 @@ void G_PreLevelTitleCard(void) ...@@ -1888,6 +1889,7 @@ void G_PreLevelTitleCard(void)
} }
if (!cv_showhud.value) if (!cv_showhud.value)
wipestyleflags = WSF_CROSSFADE; wipestyleflags = WSF_CROSSFADE;
#endif
} }
static boolean titlecardforreload = false; static boolean titlecardforreload = false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment