stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-03 06:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'selectcuts' into 'next'

Browse source 
Fix single player level select conditions (resolves #1385)

Closes #1385

See merge request STJr/SRB2!2609
This commit is contained in:
Lactozilla 2025-01-21 20:55:26 +00:00
commit 20a72e2ece
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/m_menu.c
View file

@ -3917,12 +3917,16 @@ void M_StartControlPanel(void)
} }
else if (!(netgame || multiplayer)) // Single Player else if (!(netgame || multiplayer)) // Single Player
{ {
// Devmode unlocks Pandora's Box in the pause menu // Devmode unlocks Pandora's Box and Level Select in the pause menu
boolean pandora = ((M_SecretUnlocked(SECRET_PANDORA, serverGamedata) || cv_debug || devparm) && !marathonmode); boolean isforbidden = (marathonmode || ultimatemode);
boolean isdebug = ((cv_debug || devparm) && !isforbidden);
boolean pandora = ((M_SecretUnlocked(SECRET_PANDORA, serverGamedata) && !isforbidden) || isdebug);
boolean lselect = ((M_SecretUnlocked(SECRET_LEVELSELECT, serverGamedata) && !isforbidden) || isdebug);
if (gamestate != GS_LEVEL || ultimatemode) // intermission, so gray out stuff. if (gamestate != GS_LEVEL) // intermission, so gray out stuff.
{ {
SPauseMenu[spause_pandora].status = (pandora) ? (IT_GRAYEDOUT) : (IT_DISABLED); SPauseMenu[spause_pandora].status = (pandora) ? (IT_GRAYEDOUT) : (IT_DISABLED);
SPauseMenu[spause_levelselect].status = (lselect) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
SPauseMenu[spause_retry].status = IT_GRAYEDOUT; SPauseMenu[spause_retry].status = IT_GRAYEDOUT;
} }
else else
@ -3932,6 +3936,11 @@ void M_StartControlPanel(void)
++numlives; ++numlives;
SPauseMenu[spause_pandora].status = (pandora) ? (IT_STRING | IT_CALL) : (IT_DISABLED); SPauseMenu[spause_pandora].status = (pandora) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
SPauseMenu[spause_levelselect].status = (lselect) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
if (ultimatemode)
{
SPauseMenu[spause_retry].status = IT_GRAYEDOUT;
}
// The list of things that can disable retrying is (was?) a little too complex // The list of things that can disable retrying is (was?) a little too complex
// for me to want to use the short if statement syntax // for me to want to use the short if statement syntax
@ -3941,13 +3950,6 @@ void M_StartControlPanel(void)
SPauseMenu[spause_retry].status = (IT_STRING | IT_CALL); SPauseMenu[spause_retry].status = (IT_STRING | IT_CALL);
} }
// We can always use level select though. :33
// Guarantee it if we have either it unlocked or devmode is enabled
if ((maplistoption != 0 || M_SecretUnlocked(SECRET_LEVELSELECT, serverGamedata) || cv_debug || devparm) && !marathonmode)
SPauseMenu[spause_levelselect].status = (IT_STRING | IT_CALL);
else
SPauseMenu[spause_levelselect].status = (IT_DISABLED);
// And emblem hints. // And emblem hints.
SPauseMenu[spause_hints].status = (M_SecretUnlocked(SECRET_EMBLEMHINTS, clientGamedata) && !marathonmode) ? (IT_STRING | IT_CALL) : (IT_DISABLED); SPauseMenu[spause_hints].status = (M_SecretUnlocked(SECRET_EMBLEMHINTS, clientGamedata) && !marathonmode) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
@ -7792,7 +7794,7 @@ static void M_PauseLevelSelect(INT32 choice)
// and we have the level select unlocked so that it // and we have the level select unlocked so that it
// transfers the level select list from the menu // transfers the level select list from the menu
// used to enter the game to the pause menu. // used to enter the game to the pause menu.
if (maplistoption == 0 && M_SecretUnlocked(SECRET_LEVELSELECT, serverGamedata)) if (maplistoption == 0)
maplistoption = 1; maplistoption = 1;
if (!M_PrepareLevelPlatter(-1, true)) if (!M_PrepareLevelPlatter(-1, true))