From 8f7c1e7f716fc97484a1ba2dafcaf669569a15db Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 11 Nov 2018 23:42:02 -0500 Subject: [PATCH] Fix CopyControls not firing when starting tutorial while keeping current controls --- src/m_menu.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index c88a18afa..1cc588046 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -6147,17 +6147,21 @@ void M_TutorialSaveControlResponse(INT32 ch) static void M_TutorialControlResponse(INT32 ch) { - if (ch == 'y' || ch == KEY_ENTER) + if (ch != KEY_ESCAPE) { G_CopyControls(gamecontroldefault[gcs_custom], gamecontrol, NULL, 0); - G_CopyControls(gamecontrol, gamecontroldefault[gcs_fps], gclist_tutorial, num_gclist_tutorial); - //S_StartSound(NULL, sfx_itemup); + if (ch == 'y' || ch == KEY_ENTER) + { + G_CopyControls(gamecontrol, gamecontroldefault[gcs_fps], gclist_tutorial, num_gclist_tutorial); + //S_StartSound(NULL, sfx_itemup); + } + else + S_StartSound(NULL, sfx_menu1); + + M_StartTutorial(INT32_MAX); } else S_StartSound(NULL, sfx_menu1); - - if (ch != KEY_ESCAPE) - M_StartTutorial(INT32_MAX); } // Starts up the tutorial immediately (tbh I wasn't sure where else to put this)