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

Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus

Browse source
This commit is contained in:
Jaime Passos 2019-08-20 00:21:28 -03:00
parent e4e3af7be0 15b363773f
commit d59febb5aa
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/m_menu.c
View file

@ -5320,7 +5320,11 @@ static void M_DrawLevelPlatterMenu(void)
V_DrawFadeScreen(0xFF00, curfadevalue);
// Draw and animate foreground
<<<<<<< HEAD
if ((!curbghide || !titlemapinaction) && !stricmp("RECATKBG", curbgname))
=======
if (!curbghide && stricmp("RECATTBG", curbgname) < 0)
>>>>>>> 15b363773fbaeeb8e7c7ca032c48eb5072ea34d2
M_DrawRecordAttackBackground();
}
@ -8573,7 +8577,11 @@ void M_DrawTimeAttackMenu(void)
V_DrawFadeScreen(0xFF00, curfadevalue);
// Draw and animate foreground
<<<<<<< HEAD
if ((!curbghide || !titlemapinaction) && !stricmp("RECATKBG", curbgname))
=======
if (!curbghide && stricmp("RECATTBG", curbgname) < 0)
>>>>>>> 15b363773fbaeeb8e7c7ca032c48eb5072ea34d2
M_DrawRecordAttackBackground();
M_DrawMenuTitle();