Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Fancy2209
SRB2
Commits
8fee9a51
Commit
8fee9a51
authored
4 years ago
by
Marco Z
Browse files
Options
Downloads
Patches
Plain Diff
Add NOWIPE behavaior for colormap fades
parent
9d06cb4b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/f_finale.h
+2
-0
2 additions, 0 deletions
src/f_finale.h
src/f_wipe.c
+6
-0
6 additions, 0 deletions
src/f_wipe.c
with
8 additions
and
0 deletions
src/f_finale.h
+
2
−
0
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)
...
...
This diff is collapsed.
Click to expand it.
src/f_wipe.c
+
6
−
0
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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment