From 9d24a4cb6d13e0720574e264fa62203f73405acb Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 4 Dec 2023 21:03:51 +0000 Subject: [PATCH] Fix some oversights caused by the Goner Setup's access to various Options menus --- src/menus/main-goner.cpp | 14 +++++++------- src/menus/options-1.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/menus/main-goner.cpp b/src/menus/main-goner.cpp index 36fa019e9..89786d9cd 100644 --- a/src/menus/main-goner.cpp +++ b/src/menus/main-goner.cpp @@ -375,7 +375,13 @@ void M_GonerHidePassword(void) void M_GonerResetLooking(int type) { - if (goner_youactuallylooked > 2*TICRATE + if (type == GDGONER_VIDEO) + OPTIONS_MainDef.lastOn = mopt_video; + else if (type == GDGONER_SOUND) + OPTIONS_MainDef.lastOn = mopt_sound; + else if (type == GDGONER_PROFILE) + OPTIONS_MainDef.lastOn = mopt_profiles; + else if (goner_youactuallylooked > 2*TICRATE && goner_lasttypelooking == gamedata->gonerlevel) { if (goner_levelworking > gamedata->gonerlevel) @@ -386,12 +392,6 @@ void M_GonerResetLooking(int type) goner_lasttypelooking = static_cast(type); goner_youactuallylooked = 0; - if (type == GDGONER_VIDEO) - OPTIONS_MainDef.lastOn = mopt_video; - else if (type == GDGONER_SOUND) - OPTIONS_MainDef.lastOn = mopt_sound; - else - OPTIONS_MainDef.lastOn = mopt_profiles; } void M_GonerCheckLooking(void) diff --git a/src/menus/options-1.c b/src/menus/options-1.c index a314d446b..d60942d9e 100644 --- a/src/menus/options-1.c +++ b/src/menus/options-1.c @@ -16,7 +16,7 @@ menuitem_t OPTIONS_Main[] = {IT_STRING | IT_CALL, "Video Options", "Change video settings such as the resolution.", NULL, {.routine = M_VideoOptions}, 0, 0}, - {IT_STRING | IT_SUBMENU, "Sound Options", "Adjust various sound settings such as the volume.", + {IT_STRING | IT_CALL, "Sound Options", "Adjust various sound settings such as the volume.", NULL, {.routine = M_SoundOptions}, 0, 0}, {IT_STRING | IT_SUBMENU, "HUD Options", "Options related to the Heads-Up Display.",