Migrate j_* cvars to new style

Using migration helper script.

Author: slipher

src/engine/client/cl_input.cpp

@@ -448,27 +448,27 @@ void CL_JoystickMove( usercmd_t *cmd )
 
 	if ( !kb[ KB_STRAFE ].active )
 	{
-		cl.viewangles[ YAW ] += anglespeed * j_yaw->value * cl.joystickAxis[ j_yaw_axis->integer ];
-		cmd->rightmove = ClampChar( cmd->rightmove + ( int )( j_side->value * cl.joystickAxis[ j_side_axis->integer ] ) );
+		cl.viewangles[ YAW ] += anglespeed * j_yaw.Get() * cl.joystickAxis[ j_yaw_axis.Get() ];
+		cmd->rightmove = ClampChar( cmd->rightmove + ( int )( j_side.Get() * cl.joystickAxis[ j_side_axis.Get() ] ) );
 	}
 	else
 	{
-		cl.viewangles[ YAW ] += anglespeed * j_side->value * cl.joystickAxis[ j_side_axis->integer ];
-		cmd->rightmove = ClampChar( cmd->rightmove + ( int )( j_yaw->value * cl.joystickAxis[ j_yaw_axis->integer ] ) );
+		cl.viewangles[ YAW ] += anglespeed * j_side.Get() * cl.joystickAxis[ j_side_axis.Get() ];
+		cmd->rightmove = ClampChar( cmd->rightmove + ( int )( j_yaw.Get() * cl.joystickAxis[ j_yaw_axis.Get() ] ) );
 	}
 
 	if ( kb[ KB_MLOOK ].active )
 	{
-		cl.viewangles[ PITCH ] += anglespeed * j_forward->value * cl.joystickAxis[ j_forward_axis->integer ];
-		cmd->forwardmove = ClampChar( cmd->forwardmove + ( int )( j_pitch->value * cl.joystickAxis[ j_pitch_axis->integer ] ) );
+		cl.viewangles[ PITCH ] += anglespeed * j_forward.Get() * cl.joystickAxis[ j_forward_axis.Get() ];
+		cmd->forwardmove = ClampChar( cmd->forwardmove + ( int )( j_pitch.Get() * cl.joystickAxis[ j_pitch_axis.Get() ] ) );
 	}
 	else
 	{
-		cl.viewangles[ PITCH ] += anglespeed * j_pitch->value * cl.joystickAxis[ j_pitch_axis->integer ];
-		cmd->forwardmove = ClampChar( cmd->forwardmove + ( int )( j_forward->value * cl.joystickAxis[ j_forward_axis->integer ] ) );
+		cl.viewangles[ PITCH ] += anglespeed * j_pitch.Get() * cl.joystickAxis[ j_pitch_axis.Get() ];
+		cmd->forwardmove = ClampChar( cmd->forwardmove + ( int )( j_forward.Get() * cl.joystickAxis[ j_forward_axis.Get() ] ) );
 	}
 
-	cmd->upmove = ClampChar( cmd->upmove + ( int ) ( j_up->value * cl.joystickAxis[ j_up_axis->integer ] ) );
+	cmd->upmove = ClampChar( cmd->upmove + ( int ) ( j_up.Get() * cl.joystickAxis[ j_up_axis.Get() ] ) );
 }
 
 /*

src/engine/client/cl_main.cpp

@@ -107,16 +107,16 @@ cvar_t *m_forward;
 cvar_t *m_side;
 cvar_t *m_filter;
 
-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::Cvar<float> j_pitch("j_pitch", "joystick move scale for pitch axis", Cvar::NONE, 0.022);
+Cvar::Cvar<float> j_yaw("j_yaw", "joystick move scale for yaw axis", Cvar::NONE, -0.022);
+Cvar::Cvar<float> j_forward("j_forward", "joystick move scale for forward axis", Cvar::NONE, -0.25);
+Cvar::Cvar<float> j_side("j_side", "joystick move scale for side (strafe) axis", Cvar::NONE, 0.25);
+Cvar::Cvar<float> j_up("j_up", "joystick move scale for up axis", Cvar::NONE, 1.0);
+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);
+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);
+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);
+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);
+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);
 
 cvar_t *cl_activeAction;
 
@@ -2352,18 +2352,6 @@ void CL_Init()
 	m_side = Cvar_Get( "m_side", "0.25", 0 );
 	m_filter = Cvar_Get( "m_filter", "0", CVAR_ARCHIVE );
 
-	j_pitch = Cvar_Get( "j_pitch", "0.022", 0 );
-	j_yaw = Cvar_Get( "j_yaw", "-0.022", 0 );
-	j_forward = Cvar_Get( "j_forward", "-0.25", 0 );
-	j_side = Cvar_Get( "j_side", "0.25", 0 );
-	j_up = Cvar_Get ("j_up", "1", 0);
-
-	j_pitch_axis = Cvar_Get( "j_pitch_axis", "3", 0 );
-	j_yaw_axis = Cvar_Get( "j_yaw_axis", "4", 0 );
-	j_forward_axis = Cvar_Get( "j_forward_axis", "1", 0 );
-	j_side_axis = Cvar_Get( "j_side_axis", "0", 0 );
-	j_up_axis = Cvar_Get( "j_up_axis", "2", 0 );
-
 	cl_consoleFontKerning = Cvar_Get( "cl_consoleFontKerning", "0", 0 );
 
 	cl_consoleCommand = Cvar_Get( "cl_consoleCommand", "say", 0 );

src/engine/client/client.h

@@ -410,16 +410,16 @@ extern cvar_t *m_forward;
 extern cvar_t *m_side;
 extern cvar_t *m_filter;
 
-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::Cvar<float> j_pitch;
+extern Cvar::Cvar<float> j_yaw;
+extern Cvar::Cvar<float> j_forward;
+extern Cvar::Cvar<float> j_side;
+extern Cvar::Cvar<float> j_up;
+extern Cvar::Range<Cvar::Cvar<int>> j_pitch_axis;
+extern Cvar::Range<Cvar::Cvar<int>> j_yaw_axis;
+extern Cvar::Range<Cvar::Cvar<int>> j_forward_axis;
+extern Cvar::Range<Cvar::Cvar<int>> j_side_axis;
+extern Cvar::Range<Cvar::Cvar<int>> j_up_axis;
 
 extern Cvar::Cvar<bool> cvar_demo_timedemo;