stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-31 13:40:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

FORCEWIPEOFF define in place of wipegamestate = -2

Browse source
This commit is contained in:
mazmazz 2018-11-25 19:31:22 -05:00
parent ab47e83939
commit 900f7e3dc9
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_main.c
View file

@ -288,7 +288,7 @@ static void D_Display(void)
{
// Fade to black first
if ((wipegamestate == (gamestate_t)FORCEWIPE ||
(wipegamestate != (gamestate_t)-2
(wipegamestate != (gamestate_t)FORCEWIPEOFF
&& !(gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction)))
) // fades to black on its own timing, always
&& wipetypepre != UINT8_MAX)
@ -374,7 +374,7 @@ static void D_Display(void)
// STUPID race condition...
if (wipegamestate == GS_INTRO && gamestate == GS_TITLESCREEN)
wipegamestate = -2;
wipegamestate = FORCEWIPEOFF;
else
{
wipegamestate = gamestate;

1
src/f_finale.h
View file

@ -102,6 +102,7 @@ void F_MenuPresTicker(boolean run);
//
// HACK for menu fading while titlemapinaction; skips the level check
#define FORCEWIPE -3
#define FORCEWIPEOFF -2
extern boolean WipeInAction;
extern INT32 lastwipetic;

2
src/p_setup.c
View file

@ -2729,7 +2729,7 @@ boolean P_SetupLevel(boolean skipprecip)
players[consoleplayer].viewz = 1;
// Cancel all d_main.c fadeouts (keep fade in though).
wipegamestate = -2;
wipegamestate = FORCEWIPEOFF;
// Special stage fade to white
// This is handled BEFORE sounds are stopped.