FORCEWIPEOFF define in place of wipegamestate = -2
This commit is contained in:
parent
ab47e83939
commit
900f7e3dc9
|
@ -288,7 +288,7 @@ static void D_Display(void)
|
||||||
{
|
{
|
||||||
// Fade to black first
|
// Fade to black first
|
||||||
if ((wipegamestate == (gamestate_t)FORCEWIPE ||
|
if ((wipegamestate == (gamestate_t)FORCEWIPE ||
|
||||||
(wipegamestate != (gamestate_t)-2
|
(wipegamestate != (gamestate_t)FORCEWIPEOFF
|
||||||
&& !(gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction)))
|
&& !(gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction)))
|
||||||
) // fades to black on its own timing, always
|
) // fades to black on its own timing, always
|
||||||
&& wipetypepre != UINT8_MAX)
|
&& wipetypepre != UINT8_MAX)
|
||||||
|
@ -374,7 +374,7 @@ static void D_Display(void)
|
||||||
|
|
||||||
// STUPID race condition...
|
// STUPID race condition...
|
||||||
if (wipegamestate == GS_INTRO && gamestate == GS_TITLESCREEN)
|
if (wipegamestate == GS_INTRO && gamestate == GS_TITLESCREEN)
|
||||||
wipegamestate = -2;
|
wipegamestate = FORCEWIPEOFF;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
wipegamestate = gamestate;
|
wipegamestate = gamestate;
|
||||||
|
|
|
@ -102,6 +102,7 @@ void F_MenuPresTicker(boolean run);
|
||||||
//
|
//
|
||||||
// HACK for menu fading while titlemapinaction; skips the level check
|
// HACK for menu fading while titlemapinaction; skips the level check
|
||||||
#define FORCEWIPE -3
|
#define FORCEWIPE -3
|
||||||
|
#define FORCEWIPEOFF -2
|
||||||
|
|
||||||
extern boolean WipeInAction;
|
extern boolean WipeInAction;
|
||||||
extern INT32 lastwipetic;
|
extern INT32 lastwipetic;
|
||||||
|
|
|
@ -2729,7 +2729,7 @@ boolean P_SetupLevel(boolean skipprecip)
|
||||||
players[consoleplayer].viewz = 1;
|
players[consoleplayer].viewz = 1;
|
||||||
|
|
||||||
// Cancel all d_main.c fadeouts (keep fade in though).
|
// Cancel all d_main.c fadeouts (keep fade in though).
|
||||||
wipegamestate = -2;
|
wipegamestate = FORCEWIPEOFF;
|
||||||
|
|
||||||
// Special stage fade to white
|
// Special stage fade to white
|
||||||
// This is handled BEFORE sounds are stopped.
|
// This is handled BEFORE sounds are stopped.
|
||||||
|
|
Loading…
Reference in New Issue