- fixed inconsistent wipe state with stereo 3D mode enabled

https://forum.zdoom.org/viewtopic.php?t=65181
This commit is contained in:
alexey.lysiuk 2019-06-26 22:26:14 +03:00
parent 8f00eb54d8
commit 77ea4a9fb7

View file

@ -733,27 +733,33 @@ void D_Display ()
wipegamestate = gamestate; wipegamestate = gamestate;
} }
// No wipes when in a stereo3D VR mode // No wipes when in a stereo3D VR mode
else if (gamestate != wipegamestate && gamestate != GS_FULLCONSOLE && gamestate != GS_TITLELEVEL && (vr_mode == 0 || vid_rendermode != 4)) else if (gamestate != wipegamestate && gamestate != GS_FULLCONSOLE && gamestate != GS_TITLELEVEL)
{ // save the current screen if about to wipe {
wipe = screen->WipeStartScreen (); if (vr_mode == 0 || vid_rendermode != 4)
switch (wipegamestate)
{ {
default: // save the current screen if about to wipe
wipe_type = wipetype; wipe = screen->WipeStartScreen ();
break;
case GS_FORCEWIPEFADE: switch (wipegamestate)
wipe_type = wipe_Fade; {
break; default:
wipe_type = wipetype;
break;
case GS_FORCEWIPEBURN: case GS_FORCEWIPEFADE:
wipe_type =wipe_Burn; wipe_type = wipe_Fade;
break; break;
case GS_FORCEWIPEMELT: case GS_FORCEWIPEBURN:
wipe_type = wipe_Melt; wipe_type = wipe_Burn;
break; break;
case GS_FORCEWIPEMELT:
wipe_type = wipe_Melt;
break;
}
} }
wipegamestate = gamestate; wipegamestate = gamestate;
} }
else else