From 91fd58f6e4aa41ee55649a294e561a5ca4e21f14 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Wed, 15 Feb 2012 18:09:24 +0000 Subject: [PATCH] Allow analog joystick up axis to be remapped too. --- code/client/cl_input.c | 2 +- code/client/cl_main.c | 4 ++++ code/client/client.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/client/cl_input.c b/code/client/cl_input.c index 4153b66d..c007ec5e 100644 --- a/code/client/cl_input.c +++ b/code/client/cl_input.c @@ -418,7 +418,7 @@ void CL_JoystickMove( usercmd_t *cmd ) { cmd->forwardmove = ClampChar( cmd->forwardmove + (int) (j_forward->value * cl.joystickAxis[j_forward_axis->integer]) ); } - cmd->upmove = ClampChar( cmd->upmove + cl.joystickAxis[AXIS_UP] ); + cmd->upmove = ClampChar( cmd->upmove + (int) (j_up->value * cl.joystickAxis[j_up_axis->integer]) ); } /* diff --git a/code/client/cl_main.c b/code/client/cl_main.c index 2606f6d8..b73d3d4e 100644 --- a/code/client/cl_main.c +++ b/code/client/cl_main.c @@ -96,10 +96,12 @@ cvar_t *j_pitch; cvar_t *j_yaw; cvar_t *j_forward; cvar_t *j_side; +cvar_t *j_up; cvar_t *j_pitch_axis; cvar_t *j_yaw_axis; cvar_t *j_forward_axis; cvar_t *j_side_axis; +cvar_t *j_up_axis; cvar_t *cl_activeAction; @@ -3524,10 +3526,12 @@ void CL_Init( void ) { j_yaw = Cvar_Get ("j_yaw", "-0.022", CVAR_ARCHIVE); j_forward = Cvar_Get ("j_forward", "-0.25", CVAR_ARCHIVE); j_side = Cvar_Get ("j_side", "0.25", CVAR_ARCHIVE); + j_up = Cvar_Get ("j_up", "1", CVAR_ARCHIVE); j_pitch_axis = Cvar_Get ("j_pitch_axis", "3", CVAR_ARCHIVE); j_yaw_axis = Cvar_Get ("j_yaw_axis", "4", CVAR_ARCHIVE); j_forward_axis = Cvar_Get ("j_forward_axis", "1", CVAR_ARCHIVE); j_side_axis = Cvar_Get ("j_side_axis", "0", CVAR_ARCHIVE); + j_up_axis = Cvar_Get ("j_up_axis", "2", CVAR_ARCHIVE); cl_motdString = Cvar_Get( "cl_motdString", "", CVAR_ROM ); diff --git a/code/client/client.h b/code/client/client.h index 3204dc84..bfd897eb 100644 --- a/code/client/client.h +++ b/code/client/client.h @@ -403,10 +403,12 @@ extern cvar_t *j_pitch; extern cvar_t *j_yaw; extern cvar_t *j_forward; extern cvar_t *j_side; +extern cvar_t *j_up; extern cvar_t *j_pitch_axis; extern cvar_t *j_yaw_axis; extern cvar_t *j_forward_axis; extern cvar_t *j_side_axis; +extern cvar_t *j_up_axis; extern cvar_t *cl_timedemo; extern cvar_t *cl_aviFrameRate;