stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-02 09:12:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tutorial control message adjustments

Browse source
This commit is contained in:
mazmazz 2018-11-11 09:15:43 -05:00
parent ea9f499936
commit 54f04fa5cf
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.c
View file

@ -747,7 +747,7 @@ void D_StartTitle(void)
V_SetPaletteLump("PLAYPAL"); V_SetPaletteLump("PLAYPAL");
if (tutorialpostprompt) if (tutorialpostprompt)
M_StartMessage("Do you want to save the recommended controls?\n\n(Press 'Y' to confirm, \nor any key to keep \nyour current controls.)", M_StartMessage("Do you want to \x82save the recommended \x82movement controls?\x80\n\nPress 'Y' or 'Enter' to confirm, \nor any key to keep \nyour current controls.",
M_TutorialSaveControlResponse, MM_YESNO); M_TutorialSaveControlResponse, MM_YESNO);
} }

13
src/m_menu.c
View file

@ -6139,10 +6139,10 @@ void M_TutorialSaveControlResponse(INT32 ch)
if (ch == 'y' || ch == KEY_ENTER) if (ch == 'y' || ch == KEY_ENTER)
{ {
G_CopyControls(gamecontrol, gamecontroldefault[gcs_fps], gclist_tutorial, num_gclist_tutorial); G_CopyControls(gamecontrol, gamecontroldefault[gcs_fps], gclist_tutorial, num_gclist_tutorial);
S_StartSound(NULL, sfx_strpst); S_StartSound(NULL, sfx_itemup);
} }
else else
S_StartSound(NULL, sfx_wdjump); S_StartSound(NULL, sfx_menu1);
} }
static void M_TutorialControlResponse(INT32 ch) static void M_TutorialControlResponse(INT32 ch)
@ -6151,8 +6151,13 @@ static void M_TutorialControlResponse(INT32 ch)
{ {
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); G_CopyControls(gamecontrol, gamecontroldefault[gcs_fps], gclist_tutorial, num_gclist_tutorial);
//S_StartSound(NULL, sfx_itemup);
} }
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) // Starts up the tutorial immediately (tbh I wasn't sure where else to put this)
@ -6163,7 +6168,7 @@ static void M_StartTutorial(INT32 choice)
if (choice != INT32_MAX && G_GetControlScheme(gamecontrol, gclist_tutorial, num_gclist_tutorial) == gcs_custom) if (choice != INT32_MAX && G_GetControlScheme(gamecontrol, gclist_tutorial, num_gclist_tutorial) == gcs_custom)
{ {
M_StartMessage("Do you want to try the \202recommended \202controls\x80?\n\nWe will set them just for this tutorial.\n\n(Press 'Y' to confirm,\nor any key to keep \nyour current controls.)\n",M_TutorialControlResponse,MM_YESNO); M_StartMessage("Do you want to try the \202recommended \202movement controls\x80?\n\nWe will set them just for this tutorial.\n\nPress 'Y' or 'Enter' to confirm, \nor any key to keep \nyour current controls.\n",M_TutorialControlResponse,MM_YESNO);
return; return;
} }
else if (choice != INT32_MAX) else if (choice != INT32_MAX)