Skip to content
Snippets Groups Projects
Commit de789add authored by fickleheart's avatar fickleheart
Browse files

Fix menu enterwipes being overridden?

parent 141df606
No related branches found
No related tags found
3 merge requests!985Shaders next merge,!933Menu soc bullshit mergefix,!824Menu SOC bullshit
......@@ -312,7 +312,9 @@ static void D_Display(void)
F_WipeStartScreen();
// Check for Mega Genesis fade
wipestyleflags = WSF_FADEOUT;
if (F_TryColormapFade(31))
if (wipegamestate == (gamestate_t)FORCEWIPE)
F_WipeColorFill(31);
else if (F_TryColormapFade(31))
wipetypepost = -1; // Don't run the fade below this one
F_WipeEndScreen();
F_RunWipe(wipetypepre, gamestate != GS_TIMEATTACK && gamestate != GS_TITLESCREEN);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment