Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
SRB2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
262
Issues
262
List
Board
Labels
Milestones
Merge Requests
67
Merge Requests
67
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
STJr
SRB2
Commits
8fee9a51
Commit
8fee9a51
authored
May 23, 2020
by
Marco Z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add NOWIPE behavaior for colormap fades
parent
9d06cb4b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
f_finale.h
src/f_finale.h
+2
-0
f_wipe.c
src/f_wipe.c
+6
-0
No files found.
src/f_finale.h
View file @
8fee9a51
...
...
@@ -162,7 +162,9 @@ extern wipestyleflags_t wipestyleflags;
// Even my function names are borderline
boolean
F_ShouldColormapFade
(
void
);
boolean
F_TryColormapFade
(
UINT8
wipecolor
);
#ifndef NOWIPE
void
F_DecideWipeStyle
(
void
);
#endif
#define FADECOLORMAPDIV 8
#define FADECOLORMAPROWS (256/FADECOLORMAPDIV)
...
...
src/f_wipe.c
View file @
8fee9a51
...
...
@@ -464,6 +464,7 @@ void F_WipeEndScreen(void)
*/
boolean
F_ShouldColormapFade
(
void
)
{
#ifndef NOWIPE
if
((
wipestyleflags
&
(
WSF_FADEIN
|
WSF_FADEOUT
))
// only if one of those wipestyleflags are actually set
&&
!
(
wipestyleflags
&
WSF_CROSSFADE
))
// and if not crossfading
{
...
...
@@ -479,11 +480,13 @@ boolean F_ShouldColormapFade(void)
// Menus
||
gamestate
==
GS_TIMEATTACK
);
}
#endif
return
false
;
}
/** Decides what wipe style to use.
*/
#ifndef NOWIPE
void
F_DecideWipeStyle
(
void
)
{
// Set default wipe style
...
...
@@ -493,6 +496,7 @@ void F_DecideWipeStyle(void)
if
(
F_ShouldColormapFade
())
wipestyle
=
WIPESTYLE_COLORMAP
;
}
#endif
/** Attempt to run a colormap fade,
provided all the conditionals were properly met.
...
...
@@ -501,6 +505,7 @@ void F_DecideWipeStyle(void)
*/
boolean
F_TryColormapFade
(
UINT8
wipecolor
)
{
#ifndef NOWIPE
if
(
F_ShouldColormapFade
())
{
#ifdef HWRENDER
...
...
@@ -510,6 +515,7 @@ boolean F_TryColormapFade(UINT8 wipecolor)
return
true
;
}
else
#endif
{
F_WipeColorFill
(
wipecolor
);
return
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment