lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add NOWIPE behavaior for colormap fades

This commit is contained in:
mazmazz 2020-05-23 21:23:45 -04:00
parent 9d06cb4be4
commit 8fee9a51ce
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/f_finale.h
View File

@ -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)

6
src/f_wipe.c
View File

@ -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)
// 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)
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)
*/ */
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)
return true; return true;
} }
else else
#endif
{ {
F_WipeColorFill(wipecolor); F_WipeColorFill(wipecolor);
return false; return false;