From 8b140b1831a3d1fcfe5057910a4c0501c1ab3d0f Mon Sep 17 00:00:00 2001 From: GoldenTails Date: Sat, 6 Jun 2020 05:52:29 -0500 Subject: [PATCH] Replace 'use' with 'spin' in game control constants --- src/f_finale.c | 4 ++-- src/g_input.c | 20 ++++++++++---------- src/g_input.h | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index 11f4ac475..21f355e99 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -4437,11 +4437,11 @@ static boolean F_GetTextPromptTutorialTag(char *tag, INT32 length) else if (!strncmp(tag, "TAJ", 3)) // Jump gcs = G_GetControlScheme(gamecontrol, gcl_jump, num_gcl_jump); else if (!strncmp(tag, "TAS", 3)) // Spin - gcs = G_GetControlScheme(gamecontrol, gcl_use, num_gcl_use); + gcs = G_GetControlScheme(gamecontrol, gcl_spin, num_gcl_spin); else if (!strncmp(tag, "TAA", 3)) // Char ability gcs = G_GetControlScheme(gamecontrol, gcl_jump, num_gcl_jump); else if (!strncmp(tag, "TAW", 3)) // Shield ability - gcs = G_GetControlScheme(gamecontrol, gcl_jump_use, num_gcl_jump_use); + gcs = G_GetControlScheme(gamecontrol, gcl_jump_spin, num_gcl_jump_spin); else gcs = G_GetControlScheme(gamecontrol, gcl_tutorial_used, num_gcl_tutorial_used); diff --git a/src/g_input.c b/src/g_input.c index ecce4d83c..441aa8dda 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -57,13 +57,13 @@ const INT32 gcl_tutorial_check[num_gcl_tutorial_check] = { const INT32 gcl_tutorial_used[num_gcl_tutorial_used] = { gc_forward, gc_backward, gc_strafeleft, gc_straferight, gc_turnleft, gc_turnright, - gc_jump, gc_use + gc_jump, gc_spin }; const INT32 gcl_tutorial_full[num_gcl_tutorial_full] = { gc_forward, gc_backward, gc_strafeleft, gc_straferight, gc_lookup, gc_lookdown, gc_turnleft, gc_turnright, gc_centerview, - gc_jump, gc_use, + gc_jump, gc_spin, gc_fire, gc_firenormal }; @@ -82,10 +82,10 @@ const INT32 gcl_movement_camera[num_gcl_movement_camera] = { const INT32 gcl_jump[num_gcl_jump] = { gc_jump }; -const INT32 gcl_use[num_gcl_use] = { gc_use }; +const INT32 gcl_spin[num_gcl_spin] = { gc_spin }; -const INT32 gcl_jump_use[num_gcl_jump_use] = { - gc_jump, gc_use +const INT32 gcl_jump_spin[num_gcl_jump_spin] = { + gc_jump, gc_spin }; typedef struct @@ -692,7 +692,7 @@ void G_DefineDefaultControls(void) gamecontroldefault[gcs_fps][gc_turnright ][0] = KEY_RIGHTARROW; gamecontroldefault[gcs_fps][gc_centerview ][0] = KEY_END; gamecontroldefault[gcs_fps][gc_jump ][0] = KEY_SPACE; - gamecontroldefault[gcs_fps][gc_use ][0] = KEY_LSHIFT; + gamecontroldefault[gcs_fps][gc_spin ][0] = KEY_LSHIFT; gamecontroldefault[gcs_fps][gc_fire ][0] = KEY_RCTRL; gamecontroldefault[gcs_fps][gc_fire ][1] = KEY_MOUSE1+0; gamecontroldefault[gcs_fps][gc_firenormal ][0] = 'c'; @@ -708,7 +708,7 @@ void G_DefineDefaultControls(void) gamecontroldefault[gcs_platform][gc_turnright ][0] = KEY_RIGHTARROW; gamecontroldefault[gcs_platform][gc_centerview ][0] = KEY_END; gamecontroldefault[gcs_platform][gc_jump ][0] = KEY_SPACE; - gamecontroldefault[gcs_platform][gc_use ][0] = KEY_LSHIFT; + gamecontroldefault[gcs_platform][gc_spin ][0] = KEY_LSHIFT; gamecontroldefault[gcs_platform][gc_fire ][0] = 's'; gamecontroldefault[gcs_platform][gc_fire ][1] = KEY_MOUSE1+0; gamecontroldefault[gcs_platform][gc_firenormal ][0] = 'w'; @@ -743,7 +743,7 @@ void G_DefineDefaultControls(void) gamecontroldefault[i][gc_weaponnext ][1] = KEY_JOY1+1; // B gamecontroldefault[i][gc_weaponprev ][1] = KEY_JOY1+2; // X gamecontroldefault[i][gc_tossflag ][1] = KEY_JOY1+0; // A - gamecontroldefault[i][gc_use ][1] = KEY_JOY1+4; // LB + gamecontroldefault[i][gc_spin ][1] = KEY_JOY1+4; // LB gamecontroldefault[i][gc_camtoggle ][1] = KEY_HAT1+0; // D-Pad Up gamecontroldefault[i][gc_camreset ][1] = KEY_JOY1+3; // Y gamecontroldefault[i][gc_centerview ][1] = KEY_JOY1+9; // Right Stick @@ -758,7 +758,7 @@ void G_DefineDefaultControls(void) gamecontrolbisdefault[i][gc_weaponnext][0] = KEY_2JOY1+1; // B gamecontrolbisdefault[i][gc_weaponprev][0] = KEY_2JOY1+2; // X gamecontrolbisdefault[i][gc_tossflag ][0] = KEY_2JOY1+0; // A - gamecontrolbisdefault[i][gc_use ][0] = KEY_2JOY1+4; // LB + gamecontrolbisdefault[i][gc_spin ][0] = KEY_2JOY1+4; // LB gamecontrolbisdefault[i][gc_camreset ][0] = KEY_2JOY1+3; // Y gamecontrolbisdefault[i][gc_centerview][0] = KEY_2JOY1+9; // Right Stick gamecontrolbisdefault[i][gc_jump ][0] = KEY_2JOY1+5; // RB @@ -890,7 +890,7 @@ static INT32 G_FilterKeyByVersion(INT32 numctrl, INT32 keyidx, INT32 player, INT if (GETMAJOREXECVERSION(cv_execversion.value) < 27 && ( // v2.1.22 numctrl == gc_weaponnext || numctrl == gc_weaponprev || numctrl == gc_tossflag || - numctrl == gc_use || numctrl == gc_camreset || numctrl == gc_jump || + numctrl == gc_spin || numctrl == gc_camreset || numctrl == gc_jump || numctrl == gc_pause || numctrl == gc_systemmenu || numctrl == gc_camtoggle || numctrl == gc_screenshot || numctrl == gc_talkkey || numctrl == gc_scores || numctrl == gc_centerview diff --git a/src/g_input.h b/src/g_input.h index a7484c7ad..ce38f6ba9 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -80,7 +80,7 @@ typedef enum gc_fire, gc_firenormal, gc_tossflag, - gc_use, + gc_spin, gc_camtoggle, gc_camreset, gc_lookup, @@ -141,8 +141,8 @@ extern INT32 gamecontrolbisdefault[num_gamecontrolschemes][num_gamecontrols][2]; #define num_gcl_camera 2 #define num_gcl_movement_camera 6 #define num_gcl_jump 1 -#define num_gcl_use 1 -#define num_gcl_jump_use 2 +#define num_gcl_spin 1 +#define num_gcl_jump_spin 2 extern const INT32 gcl_tutorial_check[num_gcl_tutorial_check]; extern const INT32 gcl_tutorial_used[num_gcl_tutorial_used]; @@ -151,8 +151,8 @@ extern const INT32 gcl_movement[num_gcl_movement]; extern const INT32 gcl_camera[num_gcl_camera]; extern const INT32 gcl_movement_camera[num_gcl_movement_camera]; extern const INT32 gcl_jump[num_gcl_jump]; -extern const INT32 gcl_use[num_gcl_use]; -extern const INT32 gcl_jump_use[num_gcl_jump_use]; +extern const INT32 gcl_spin[num_gcl_spin]; +extern const INT32 gcl_jump_spin[num_gcl_jump_spin]; // peace to my little coder fingers! // check a gamecontrol being active or not