From 96da056f819a844033583318fa72477b9b77b939 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Mon, 12 Nov 2018 23:25:49 -0500 Subject: [PATCH] tutorial-time gclist -> gcl refactor --- src/d_main.c | 2 +- src/d_netcmd.c | 2 +- src/m_menu.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index bbc5f5321..f19c92295 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -738,7 +738,7 @@ void D_StartTitle(void) // The title screen is obviously not a tutorial! (Unless I'm mistaken) if (tutorialmode && tutorialgcs) { - G_CopyControls(gamecontrol, gamecontroldefault[gcs_custom], gclist_tutorial, num_gclist_tutorial); // using gcs_custom as temp storage + G_CopyControls(gamecontrol, gamecontroldefault[gcs_custom], gcl_tutorial_full, num_gcl_tutorial_full); // using gcs_custom as temp storage CV_SetValue(&cv_usemouse, tutorialusemouse); CV_SetValue(&cv_alwaysfreelook, tutorialfreelook); CV_SetValue(&cv_mousemove, tutorialmousemove); diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 413619bca..bb33eb133 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1811,7 +1811,7 @@ static void Command_Map_f(void) if (tutorialmode && tutorialgcs) { - G_CopyControls(gamecontrol, gamecontroldefault[gcs_custom], gclist_tutorial, num_gclist_tutorial); // using gcs_custom as temp storage + G_CopyControls(gamecontrol, gamecontroldefault[gcs_custom], gcl_tutorial_full, num_gcl_tutorial_full); // using gcs_custom as temp storage CV_SetValue(&cv_usemouse, tutorialusemouse); CV_SetValue(&cv_alwaysfreelook, tutorialfreelook); CV_SetValue(&cv_mousemove, tutorialmousemove); diff --git a/src/m_menu.c b/src/m_menu.c index 367836a9f..a3dbccf11 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -6141,7 +6141,7 @@ void M_TutorialSaveControlResponse(INT32 ch) { if (ch == 'y' || ch == KEY_ENTER) { - G_CopyControls(gamecontrol, gamecontroldefault[tutorialgcs], gclist_tutorial, num_gclist_tutorial); + G_CopyControls(gamecontrol, gamecontroldefault[tutorialgcs], gcl_tutorial_full, num_gcl_tutorial_full); CV_Set(&cv_usemouse, cv_usemouse.defaultvalue); CV_Set(&cv_alwaysfreelook, cv_alwaysfreelook.defaultvalue); CV_Set(&cv_mousemove, cv_mousemove.defaultvalue); @@ -6165,7 +6165,7 @@ static void M_TutorialControlResponse(INT32 ch) tutorialmousemove = cv_mousemove.value; tutorialanalog = cv_analog.value; - G_CopyControls(gamecontrol, gamecontroldefault[tutorialgcs], gclist_tutorial, num_gclist_tutorial); + G_CopyControls(gamecontrol, gamecontroldefault[tutorialgcs], gcl_tutorial_full, num_gcl_tutorial_full); CV_Set(&cv_usemouse, cv_usemouse.defaultvalue); CV_Set(&cv_alwaysfreelook, cv_alwaysfreelook.defaultvalue); CV_Set(&cv_mousemove, cv_mousemove.defaultvalue); @@ -6192,7 +6192,7 @@ static void M_StartTutorial(INT32 choice) if (!tutorialmap) return; // no map to go to, don't bother - if (choice != INT32_MAX && G_GetControlScheme(gamecontrol, gclist_tutorial_check, num_gclist_tutorial_check) == gcs_custom) + if (choice != INT32_MAX && G_GetControlScheme(gamecontrol, gcl_tutorial_check, num_gcl_tutorial_check) == gcs_custom) { 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\nPress 'N' or any key to keep \nyour current controls.\n",M_TutorialControlResponse,MM_YESNO); return;