From 25d8b7d5eae35555360c927a61b3848acd4fd1bc Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 19 Oct 2019 12:25:02 -0700 Subject: [PATCH] Don't fade to Server Options --- src/m_menu.c | 6 ++++++ src/m_menu.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/m_menu.c b/src/m_menu.c index 9132c8d7d..a64c3c70f 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -9820,6 +9820,12 @@ static void M_ServerOptions(INT32 choice) } #endif + /* Disable fading because of different menu head. */ + if (currentMenu == &OP_MainDef)/* from Options menu */ + OP_ServerOptionsDef.menuid = MN_OP_MAIN + ( MN_OP_SERVER << 6 ); + else/* from Multiplayer menu */ + OP_ServerOptionsDef.menuid = MN_MP_MAIN + ( MN_MP_SERVER_OPTIONS << 6 ); + OP_ServerOptionsDef.prevMenu = currentMenu; M_SetupNextMenu(&OP_ServerOptionsDef); } diff --git a/src/m_menu.h b/src/m_menu.h index 7099df8d2..ba545771e 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -63,6 +63,7 @@ typedef enum MN_MP_CONNECT, MN_MP_ROOM, MN_MP_PLAYERSETUP, // MP_PlayerSetupDef shared with SPLITSCREEN if #defined NONET + MN_MP_SERVER_OPTIONS, // Options MN_OP_MAIN,