From dfdbc0afe3ad92e116f494b663afab07b73f8192 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 19 Oct 2019 12:42:53 -0700
Subject: [PATCH] Don't fade to character select from secret level select
---
src/m_menu.c | 15 +++++++++++++++
src/m_menu.h | 1 +
2 files changed, 16 insertions(+)
diff --git a/src/m_menu.c b/src/m_menu.c
index a64c3c70f7..c09538f1a5 100644
--- a/src/m_menu.c
+++ b/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)
diff --git a/src/m_menu.h b/src/m_menu.h
index ba545771e6..14b3e0902a 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -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,
--
GitLab