lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed titlemap wipe lasting too long/happening twice over

Browse source
This commit is contained in:
toasterbabe 2017-03-28 17:54:54 +01:00 committed by yellowtd
parent 217f7ebd38
commit eea7dc4224
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.c
View file

@ -302,7 +302,7 @@ static void D_Display(void)
if (rendermode != render_none) if (rendermode != render_none)
{ {
// Fade to black first // Fade to black first
if (gamestate != GS_LEVEL // fades to black on its own timing, always if (!(gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction)) // fades to black on its own timing, always
&& wipedefs[wipedefindex] != UINT8_MAX) && wipedefs[wipedefindex] != UINT8_MAX)
{ {
F_WipeStartScreen(); F_WipeStartScreen();

3
src/f_finale.c
View file

@ -1429,6 +1429,7 @@ void F_StartTitleScreen(void)
if (titlemap) if (titlemap)
{ {
gamestate_t prevwipegamestate = wipegamestate;
titlemapinaction = true; titlemapinaction = true;
gamemap = titlemap; gamemap = titlemap;
@ -1439,6 +1440,8 @@ void F_StartTitleScreen(void)
players[displayplayer].playerstate = PST_DEAD; // Don't spawn the player in dummy (I'm still a filthy cheater) players[displayplayer].playerstate = PST_DEAD; // Don't spawn the player in dummy (I'm still a filthy cheater)
camera.subsector = NULL; // toast is filthy too camera.subsector = NULL; // toast is filthy too
//CON_ClearHUD(); //CON_ClearHUD();
wipegamestate = prevwipegamestate;
} }
else else
{ {