mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-01-29 20:50:58 +00:00
Don't fade to character select from secret level select
This commit is contained in:
parent
25d8b7d5ea
commit
dfdbc0afe3
2 changed files with 16 additions and 0 deletions
15
src/m_menu.c
15
src/m_menu.c
|
@ -7977,6 +7977,21 @@ static void M_SetupChoosePlayer(INT32 choice)
|
|||
|
||||
M_ChangeMenuMusic("_chsel", true);
|
||||
|
||||
/* the menus suck -James */
|
||||
if (currentMenu == &SP_LoadDef)/* from save states */
|
||||
{
|
||||
SP_PlayerDef.menuid =
|
||||
MN_SP_MAIN +
|
||||
( MN_SP_LOAD << 6 ) +
|
||||
( MN_SP_PLAYER << 12 );
|
||||
}
|
||||
else/* from Secret level select */
|
||||
{
|
||||
SP_PlayerDef.menuid =
|
||||
MN_SR_MAIN +
|
||||
( MN_SR_PLAYER << 6 );
|
||||
}
|
||||
|
||||
SP_PlayerDef.prevMenu = currentMenu;
|
||||
M_SetupNextMenu(&SP_PlayerDef);
|
||||
if (!allowed)
|
||||
|
|
|
@ -104,6 +104,7 @@ typedef enum
|
|||
MN_SR_LEVELSELECT,
|
||||
MN_SR_UNLOCKCHECKLIST,
|
||||
MN_SR_EMBLEMHINT,
|
||||
MN_SR_PLAYER,
|
||||
|
||||
// Addons (Part of MISC, but let's make it our own)
|
||||
MN_AD_MAIN,
|
||||
|
|
Loading…
Reference in a new issue