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
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
272362a8
Commit
272362a8
authored
May 24, 2020
by
Marco Z
Browse files
Options
Downloads
Patches
Plain Diff
Fix NOWIPE bugs with colormap fade and title card
parent
8fee9a51
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!985
Shaders next merge
,
!962
NOWIPE fixes for colormap and title card wipes
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/f_wipe.c
+2
-0
2 additions, 0 deletions
src/f_wipe.c
src/g_game.c
+2
-0
2 additions, 0 deletions
src/g_game.c
with
4 additions
and
0 deletions
src/f_wipe.c
+
2
−
0
View file @
272362a8
...
...
@@ -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"
;
...
...
This diff is collapsed.
Click to expand it.
src/g_game.c
+
2
−
0
View file @
272362a8
...
...
@@ -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
;
...
...
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