lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix CopyControls not firing when starting tutorial while keeping current controls

Browse source
This commit is contained in:
mazmazz 2018-11-11 23:42:02 -05:00
parent 703cb6be0f
commit 8f7c1e7f71
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/m_menu.c
View file

@ -6147,17 +6147,21 @@ void M_TutorialSaveControlResponse(INT32 ch)
static void M_TutorialControlResponse(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(gamecontroldefault[gcs_custom], gamecontrol, NULL, 0);
G_CopyControls(gamecontrol, gamecontroldefault[gcs_fps], gclist_tutorial, num_gclist_tutorial); if (ch == 'y' || ch == KEY_ENTER)
//S_StartSound(NULL, sfx_itemup); {
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 else
S_StartSound(NULL, sfx_menu1); 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) // Starts up the tutorial immediately (tbh I wasn't sure where else to put this)