Skip to content

Commit 3b84719

Browse files
slipherslipher
committed
Rename joystick cvars of pattern j_foo_axis to j_fooAxis
Since underscores are now assumed to be namespace separators.
1 parent e4a889f commit 3b84719

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎src/engine/client/cl_input.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -448,27 +448,27 @@ void CL_JoystickMove( usercmd_t *cmd )
448448

449449
if ( !kb[ KB_STRAFE ].active )
450450
{
451-
cl.viewangles[ YAW ] += anglespeed * j_yaw.Get() * cl.joystickAxis[ j_yaw_axis.Get() ];
452-
cmd->rightmove = ClampChar( cmd->rightmove + ( int )( j_side.Get() * cl.joystickAxis[ j_side_axis.Get() ] ) );
451+
cl.viewangles[ YAW ] += anglespeed * j_yaw.Get() * cl.joystickAxis[ j_yawAxis.Get() ];
452+
cmd->rightmove = ClampChar( cmd->rightmove + ( int )( j_side.Get() * cl.joystickAxis[ j_sideAxis.Get() ] ) );
453453
}
454454
else
455455
{
456-
cl.viewangles[ YAW ] += anglespeed * j_side.Get() * cl.joystickAxis[ j_side_axis.Get() ];
457-
cmd->rightmove = ClampChar( cmd->rightmove + ( int )( j_yaw.Get() * cl.joystickAxis[ j_yaw_axis.Get() ] ) );
456+
cl.viewangles[ YAW ] += anglespeed * j_side.Get() * cl.joystickAxis[ j_sideAxis.Get() ];
457+
cmd->rightmove = ClampChar( cmd->rightmove + ( int )( j_yaw.Get() * cl.joystickAxis[ j_yawAxis.Get() ] ) );
458458
}
459459

460460
if ( kb[ KB_MLOOK ].active )
461461
{
462-
cl.viewangles[ PITCH ] += anglespeed * j_forward.Get() * cl.joystickAxis[ j_forward_axis.Get() ];
463-
cmd->forwardmove = ClampChar( cmd->forwardmove + ( int )( j_pitch.Get() * cl.joystickAxis[ j_pitch_axis.Get() ] ) );
462+
cl.viewangles[ PITCH ] += anglespeed * j_forward.Get() * cl.joystickAxis[ j_forwardAxis.Get() ];
463+
cmd->forwardmove = ClampChar( cmd->forwardmove + ( int )( j_pitch.Get() * cl.joystickAxis[ j_pitchAxis.Get() ] ) );
464464
}
465465
else
466466
{
467-
cl.viewangles[ PITCH ] += anglespeed * j_pitch.Get() * cl.joystickAxis[ j_pitch_axis.Get() ];
468-
cmd->forwardmove = ClampChar( cmd->forwardmove + ( int )( j_forward.Get() * cl.joystickAxis[ j_forward_axis.Get() ] ) );
467+
cl.viewangles[ PITCH ] += anglespeed * j_pitch.Get() * cl.joystickAxis[ j_pitchAxis.Get() ];
468+
cmd->forwardmove = ClampChar( cmd->forwardmove + ( int )( j_forward.Get() * cl.joystickAxis[ j_forwardAxis.Get() ] ) );
469469
}
470470

471-
cmd->upmove = ClampChar( cmd->upmove + ( int ) ( j_up.Get() * cl.joystickAxis[ j_up_axis.Get() ] ) );
471+
cmd->upmove = ClampChar( cmd->upmove + ( int ) ( j_up.Get() * cl.joystickAxis[ j_upAxis.Get() ] ) );
472472
}
473473

474474
/*

‎src/engine/client/cl_main.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ Cvar::Cvar<float> j_yaw("j_yaw", "joystick move scale for yaw axis", Cvar::NONE,
112112
Cvar::Cvar<float> j_forward("j_forward", "joystick move scale for forward axis", Cvar::NONE, -0.25);
113113
Cvar::Cvar<float> j_side("j_side", "joystick move scale for side (strafe) axis", Cvar::NONE, 0.25);
114114
Cvar::Cvar<float> j_up("j_up", "joystick move scale for up axis", Cvar::NONE, 1.0);
115-
Cvar::Range<Cvar::Cvar<int>> j_pitch_axis("j_pitch_axis", "joystick pitch axis number", Cvar::NONE, 3, 0, Util::ordinal(joystickAxis_t::MAX_JOYSTICK_AXIS) - 1);
116-
Cvar::Range<Cvar::Cvar<int>> j_yaw_axis("j_yaw_axis", "joystick yaw axis number", Cvar::NONE, 4, 0, Util::ordinal(joystickAxis_t::MAX_JOYSTICK_AXIS) - 1);
117-
Cvar::Range<Cvar::Cvar<int>> j_forward_axis("j_forward_axis", "joystick forward axis number", Cvar::NONE, 1, 0, Util::ordinal(joystickAxis_t::MAX_JOYSTICK_AXIS) - 1);
118-
Cvar::Range<Cvar::Cvar<int>> j_side_axis("j_side_axis", "joystick side (strafe) axis number", Cvar::NONE, 0, 0, Util::ordinal(joystickAxis_t::MAX_JOYSTICK_AXIS) - 1);
119-
Cvar::Range<Cvar::Cvar<int>> j_up_axis("j_up_axis", "joystick up axis number", Cvar::NONE, 2, 0, Util::ordinal(joystickAxis_t::MAX_JOYSTICK_AXIS) - 1);
115+
Cvar::Range<Cvar::Cvar<int>> j_pitchAxis("j_pitchAxis", "joystick pitch axis number", Cvar::NONE, 3, 0, Util::ordinal(joystickAxis_t::MAX_JOYSTICK_AXIS) - 1);
116+
Cvar::Range<Cvar::Cvar<int>> j_yawAxis("j_yawAxis", "joystick yaw axis number", Cvar::NONE, 4, 0, Util::ordinal(joystickAxis_t::MAX_JOYSTICK_AXIS) - 1);
117+
Cvar::Range<Cvar::Cvar<int>> j_forwardAxis("j_forwardAxis", "joystick forward axis number", Cvar::NONE, 1, 0, Util::ordinal(joystickAxis_t::MAX_JOYSTICK_AXIS) - 1);
118+
Cvar::Range<Cvar::Cvar<int>> j_sideAxis("j_sideAxis", "joystick side (strafe) axis number", Cvar::NONE, 0, 0, Util::ordinal(joystickAxis_t::MAX_JOYSTICK_AXIS) - 1);
119+
Cvar::Range<Cvar::Cvar<int>> j_upAxis("j_upAxis", "joystick up axis number", Cvar::NONE, 2, 0, Util::ordinal(joystickAxis_t::MAX_JOYSTICK_AXIS) - 1);
120120

121121
cvar_t *cl_activeAction;
122122

‎src/engine/client/client.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -415,11 +415,11 @@ extern Cvar::Cvar<float> j_yaw;
415415
extern Cvar::Cvar<float> j_forward;
416416
extern Cvar::Cvar<float> j_side;
417417
extern Cvar::Cvar<float> j_up;
418-
extern Cvar::Range<Cvar::Cvar<int>> j_pitch_axis;
419-
extern Cvar::Range<Cvar::Cvar<int>> j_yaw_axis;
420-
extern Cvar::Range<Cvar::Cvar<int>> j_forward_axis;
421-
extern Cvar::Range<Cvar::Cvar<int>> j_side_axis;
422-
extern Cvar::Range<Cvar::Cvar<int>> j_up_axis;
418+
extern Cvar::Range<Cvar::Cvar<int>> j_pitchAxis;
419+
extern Cvar::Range<Cvar::Cvar<int>> j_yawAxis;
420+
extern Cvar::Range<Cvar::Cvar<int>> j_forwardAxis;
421+
extern Cvar::Range<Cvar::Cvar<int>> j_sideAxis;
422+
extern Cvar::Range<Cvar::Cvar<int>> j_upAxis;
423423

424424
extern Cvar::Cvar<bool> cvar_demo_timedemo;
425425

0 commit comments

Comments
 (0)