Skip to content

Commit df54009

Browse files
committed
Migrate m_* (mouse) cvars to new style
Using migration script
1 parent e636540 commit df54009

File tree

3 files changed

+15
-20
lines changed

3 files changed

+15
-20
lines changed

src/engine/client/cl_input.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ void CL_MouseMove( usercmd_t *cmd )
514514
float mx, my;
515515

516516
// allow mouse smoothing
517-
if ( m_filter->integer )
517+
if ( m_filter.Get() )
518518
{
519519
mx = ( cl.mouseDx[ 0 ] + cl.mouseDx[ 1 ] ) * 0.5f;
520520
my = ( cl.mouseDy[ 0 ] + cl.mouseDy[ 1 ] ) * 0.5f;
@@ -587,21 +587,21 @@ void CL_MouseMove( usercmd_t *cmd )
587587
// add mouse X/Y movement to cmd
588588
if ( kb[ KB_STRAFE ].active )
589589
{
590-
cmd->rightmove = ClampChar( cmd->rightmove + m_side->value * mx );
590+
cmd->rightmove = ClampChar( cmd->rightmove + m_side.Get() * mx );
591591
}
592592
else
593593
{
594-
cl.viewangles[ YAW ] -= m_yaw->value * mx;
594+
cl.viewangles[ YAW ] -= m_yaw.Get() * mx;
595595
}
596596

597597
if ( ( kb[ KB_MLOOK ].active || cl_freelook->integer ) && !kb[ KB_STRAFE ].active )
598598
{
599-
cl.viewangles[ PITCH ] += m_pitch->value * my;
599+
cl.viewangles[ PITCH ] += m_pitch.Get() * my;
600600
}
601601

602602
else
603603
{
604-
cmd->forwardmove = ClampChar( cmd->forwardmove - m_forward->value * my );
604+
cmd->forwardmove = ClampChar( cmd->forwardmove - m_forward.Get() * my );
605605
}
606606
}
607607

src/engine/client/cl_main.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ cvar_t *cl_mouseAccel;
101101
cvar_t *cl_mouseAccelStyle;
102102
cvar_t *cl_showMouseRate;
103103

104-
cvar_t *m_pitch;
105-
cvar_t *m_yaw;
106-
cvar_t *m_forward;
107-
cvar_t *m_side;
108-
cvar_t *m_filter;
104+
Cvar::Cvar<float> m_pitch("m_pitch", "mouse sensitivity modifier for looking up/down", Cvar::NONE, 0.022);
105+
Cvar::Cvar<float> m_yaw("m_yaw", "mouse sensitivity modifier for looking left/right", Cvar::NONE, 0.022);
106+
Cvar::Cvar<float> m_forward("m_forward", "mouse sensitivity modifier for (mlook off) walking", Cvar::NONE, 0.25);
107+
Cvar::Cvar<float> m_side("m_side", "mouse sensitivity modifier for +strafe", Cvar::NONE, 0.25);
108+
Cvar::Cvar<bool> m_filter("m_filter", "smooth mouse inputs over 2 frames", Cvar::NONE, false);
109109

110110
Cvar::Cvar<float> j_pitch("j_pitch", "joystick move scale for pitch axis", Cvar::NONE, 0.022);
111111
Cvar::Cvar<float> j_yaw("j_yaw", "joystick move scale for yaw axis", Cvar::NONE, -0.022);
@@ -2346,11 +2346,6 @@ void CL_Init()
23462346
cl_allowDownload = Cvar_Get( "cl_allowDownload", "1", 0 );
23472347

23482348
cl_doubletapdelay = Cvar_Get( "cl_doubletapdelay", "250", 0 ); // Arnout: double tap
2349-
m_pitch = Cvar_Get( "m_pitch", "0.022", CVAR_ARCHIVE );
2350-
m_yaw = Cvar_Get( "m_yaw", "0.022", 0 );
2351-
m_forward = Cvar_Get( "m_forward", "0.25", 0 );
2352-
m_side = Cvar_Get( "m_side", "0.25", 0 );
2353-
m_filter = Cvar_Get( "m_filter", "0", CVAR_ARCHIVE );
23542349

23552350
cl_consoleFontKerning = Cvar_Get( "cl_consoleFontKerning", "0", 0 );
23562351

src/engine/client/client.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -404,11 +404,11 @@ extern cvar_t *cl_mouseAccelOffset;
404404
extern cvar_t *cl_mouseAccelStyle;
405405
extern cvar_t *cl_showMouseRate;
406406

407-
extern cvar_t *m_pitch;
408-
extern cvar_t *m_yaw;
409-
extern cvar_t *m_forward;
410-
extern cvar_t *m_side;
411-
extern cvar_t *m_filter;
407+
extern Cvar::Cvar<float> m_pitch;
408+
extern Cvar::Cvar<float> m_yaw;
409+
extern Cvar::Cvar<float> m_forward;
410+
extern Cvar::Cvar<float> m_side;
411+
extern Cvar::Cvar<bool> m_filter;
412412

413413
extern Cvar::Cvar<float> j_pitch;
414414
extern Cvar::Cvar<float> j_yaw;

0 commit comments

Comments
 (0)