Skip to content

Commit 9e52452

Browse files
slipherslipher
committed
Migrate some input-related cl_* cvars
Using migration script
1 parent e0c1b8c commit 9e52452

File tree

3 files changed

+30
-38
lines changed

3 files changed

+30
-38
lines changed

‎src/engine/client/cl_input.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,14 @@ void IN_CenterView ()
208208

209209
//==========================================================================
210210

211-
cvar_t *cl_yawspeed;
212-
cvar_t *cl_pitchspeed;
211+
Cvar::Cvar<float> cl_yawspeed("cl_yawspeed", "speed of turning left/right using keys", Cvar::NONE, 140);
212+
Cvar::Cvar<float> cl_pitchspeed("cl_pitchspeed", "speed of looking up/down using keys", Cvar::NONE, 140);
213213

214-
cvar_t *cl_run;
214+
Cvar::Cvar<bool> cl_run("cl_run", "run rather than walk by default (without +speed)", Cvar::NONE, true);
215215

216-
cvar_t *cl_anglespeedkey;
216+
Cvar::Cvar<float> cl_anglespeedkey("cl_anglespeedkey", "+speed keyboard view rotation modifier", Cvar::NONE, 1.5);
217217

218-
cvar_t *cl_doubletapdelay;
218+
Cvar::Range<Cvar::Cvar<int>> cl_doubletapdelay("cl_doubletapdelay", "maximum delay (ms) between key presses for double-tap", Cvar::NONE, 250, 0, 1000);
219219

220220
/*
221221
================
@@ -230,7 +230,7 @@ void CL_AdjustAngles()
230230

231231
if ( kb[ KB_SPEED ].active )
232232
{
233-
speed = 0.001f * cls.frametime * cl_anglespeedkey->value;
233+
speed = 0.001f * cls.frametime * cl_anglespeedkey.Get();
234234
}
235235
else
236236
{
@@ -239,12 +239,12 @@ void CL_AdjustAngles()
239239

240240
if ( !kb[ KB_STRAFE ].active )
241241
{
242-
cl.viewangles[ YAW ] -= speed * cl_yawspeed->value * CL_KeyState( &kb[ KB_RIGHT ] );
243-
cl.viewangles[ YAW ] += speed * cl_yawspeed->value * CL_KeyState( &kb[ KB_LEFT ] );
242+
cl.viewangles[ YAW ] -= speed * cl_yawspeed.Get() * CL_KeyState( &kb[ KB_RIGHT ] );
243+
cl.viewangles[ YAW ] += speed * cl_yawspeed.Get() * CL_KeyState( &kb[ KB_LEFT ] );
244244
}
245245

246-
cl.viewangles[ PITCH ] -= speed * cl_pitchspeed->value * CL_KeyState( &kb[ KB_LOOKUP ] );
247-
cl.viewangles[ PITCH ] += speed * cl_pitchspeed->value * CL_KeyState( &kb[ KB_LOOKDOWN ] );
246+
cl.viewangles[ PITCH ] -= speed * cl_pitchspeed.Get() * CL_KeyState( &kb[ KB_LOOKUP ] );
247+
cl.viewangles[ PITCH ] += speed * cl_pitchspeed.Get() * CL_KeyState( &kb[ KB_LOOKDOWN ] );
248248
}
249249

250250
/*
@@ -264,7 +264,7 @@ void CL_KeyMove( usercmd_t *cmd )
264264
// the walking flag is to keep animations consistent
265265
// even during acceleration and deceleration
266266
//
267-
if ( kb[ KB_SPEED ].active != (cl_run->integer != 0) )
267+
if ( kb[ KB_SPEED ].active != cl_run.Get() )
268268
{
269269
movespeed = 127;
270270
usercmdReleaseButton( cmd->buttons, BUTTON_WALKING );
@@ -301,7 +301,7 @@ void CL_KeyMove( usercmd_t *cmd )
301301
// Arnout: double tap
302302
cmd->doubleTap = dtType_t::DT_NONE; // reset
303303

304-
if ( !cl.doubleTap.lastdoubleTap || com_frameTime - cl.doubleTap.lastdoubleTap > cl_doubletapdelay->integer + cls.frametime )
304+
if ( !cl.doubleTap.lastdoubleTap || com_frameTime - cl.doubleTap.lastdoubleTap > cl_doubletapdelay.Get() + cls.frametime )
305305
{
306306
int i;
307307
bool key_down;
@@ -347,23 +347,23 @@ void CL_KeyMove( usercmd_t *cmd )
347347
else if ( !key_down &&
348348
cl.doubleTap.pressedTime[ i ] &&
349349
!cl.doubleTap.releasedTime[ i ] &&
350-
com_frameTime - cl.doubleTap.pressedTime[ i ] < cl_doubletapdelay->integer + cls.frametime )
350+
com_frameTime - cl.doubleTap.pressedTime[ i ] < cl_doubletapdelay.Get() + cls.frametime )
351351
{
352352
cl.doubleTap.releasedTime[ i ] = com_frameTime;
353353
}
354354
else if ( key_down &&
355355
cl.doubleTap.pressedTime[ i ] &&
356356
cl.doubleTap.releasedTime[ i ] &&
357-
com_frameTime - cl.doubleTap.pressedTime[ i ] < cl_doubletapdelay->integer + cls.frametime &&
358-
com_frameTime - cl.doubleTap.releasedTime[ i ] < cl_doubletapdelay->integer + cls.frametime )
357+
com_frameTime - cl.doubleTap.pressedTime[ i ] < cl_doubletapdelay.Get() + cls.frametime &&
358+
com_frameTime - cl.doubleTap.releasedTime[ i ] < cl_doubletapdelay.Get() + cls.frametime )
359359
{
360360
cl.doubleTap.pressedTime[ i ] = cl.doubleTap.releasedTime[ i ] = 0;
361361
cmd->doubleTap = Util::enum_cast<dtType_t>(i);
362362
cl.doubleTap.lastdoubleTap = com_frameTime;
363363
}
364364
else if ( !key_down && ( cl.doubleTap.pressedTime[ i ] || cl.doubleTap.releasedTime[ i ] ) )
365365
{
366-
if ( com_frameTime - cl.doubleTap.pressedTime[ i ] >= ( cl_doubletapdelay->integer + cls.frametime ) )
366+
if ( com_frameTime - cl.doubleTap.pressedTime[ i ] >= ( cl_doubletapdelay.Get() + cls.frametime ) )
367367
{
368368
cl.doubleTap.pressedTime[ i ] = cl.doubleTap.releasedTime[ i ] = 0;
369369
}
@@ -434,14 +434,14 @@ void CL_JoystickMove( usercmd_t *cmd )
434434
// int movespeed;
435435
float anglespeed;
436436

437-
if ( kb[ KB_SPEED ].active == (cl_run->integer != 0) )
437+
if ( kb[ KB_SPEED ].active == cl_run.Get() )
438438
{
439439
usercmdPressButton( cmd->buttons, BUTTON_WALKING );
440440
}
441441

442442
if ( kb[ KB_SPEED ].active )
443443
{
444-
anglespeed = 0.001f * cls.frametime * cl_anglespeedkey->value;
444+
anglespeed = 0.001f * cls.frametime * cl_anglespeedkey.Get();
445445
}
446446
else
447447
{
@@ -484,22 +484,22 @@ void CL_GameControllerMove( usercmd_t *cmd )
484484
// int movespeed;
485485
float anglespeed;
486486

487-
if ( kb[ KB_SPEED ].active == (cl_run->integer != 0) )
487+
if ( kb[ KB_SPEED ].active == cl_run.Get() )
488488
{
489489
usercmdPressButton( cmd->buttons, BUTTON_WALKING );
490490
}
491491

492492
if ( kb[ KB_SPEED ].active )
493493
{
494-
anglespeed = 0.001f * cls.frametime * cl_anglespeedkey->value;
494+
anglespeed = 0.001f * cls.frametime * cl_anglespeedkey.Get();
495495
}
496496
else
497497
{
498498
anglespeed = 0.001f * cls.frametime;
499499
}
500500

501-
cl.viewangles[ PITCH ] += anglespeed * cl_pitchspeed->value * ( cl.joystickAxis[ Util::ordinal(joystickAxis_t::AXIS_PITCH) ] / 127.0f );
502-
cl.viewangles[ YAW ] += anglespeed * cl_yawspeed->value * ( cl.joystickAxis[ Util::ordinal(joystickAxis_t::AXIS_YAW) ] / 127.0f );
501+
cl.viewangles[ PITCH ] += anglespeed * cl_pitchspeed.Get() * ( cl.joystickAxis[ Util::ordinal(joystickAxis_t::AXIS_PITCH) ] / 127.0f );
502+
cl.viewangles[ YAW ] += anglespeed * cl_yawspeed.Get() * ( cl.joystickAxis[ Util::ordinal(joystickAxis_t::AXIS_YAW) ] / 127.0f );
503503

504504
cmd->rightmove = ClampChar( cmd->rightmove + cl.joystickAxis[ Util::ordinal(joystickAxis_t::AXIS_SIDE) ] );
505505
cmd->forwardmove = ClampChar( cmd->forwardmove + cl.joystickAxis[ Util::ordinal(joystickAxis_t::AXIS_FORWARD) ] );
@@ -586,7 +586,7 @@ void CL_MouseMove( usercmd_t *cmd )
586586
cl.viewangles[ YAW ] -= m_yaw.Get() * mx;
587587
}
588588

589-
if ( ( kb[ KB_MLOOK ].active || cl_freelook->integer ) && !kb[ KB_STRAFE ].active )
589+
if ( ( kb[ KB_MLOOK ].active || cl_freelook.Get() ) && !kb[ KB_STRAFE ].active )
590590
{
591591
cl.viewangles[ PITCH ] += m_pitch.Get() * my;
592592
}

‎src/engine/client/cl_main.cpp‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Cvar::Cvar<std::string> cvar_demo_status_filename(
9393

9494
cvar_t *cl_aviFrameRate;
9595

96-
cvar_t *cl_freelook;
96+
Cvar::Cvar<bool> cl_freelook("cl_freelook", "vertical mouse movement always controls pitch", Cvar::NONE, true);
9797

9898
cvar_t *cl_mouseAccelOffset;
9999
cvar_t *cl_mouseAccel;
@@ -2319,16 +2319,10 @@ void CL_Init()
23192319
cl_aviMotionJpeg = Cvar_Get( "cl_aviMotionJpeg", "1", 0 );
23202320
// XreaL END
23212321

2322-
cl_yawspeed = Cvar_Get( "cl_yawspeed", "140", 0 );
2323-
cl_pitchspeed = Cvar_Get( "cl_pitchspeed", "140", 0 );
2324-
cl_anglespeedkey = Cvar_Get( "cl_anglespeedkey", "1.5", 0 );
2325-
23262322
cl_maxpackets = Cvar_Get( "cl_maxpackets", "125", 0 );
23272323
cl_packetdup = Cvar_Get( "cl_packetdup", "1", 0 );
23282324

2329-
cl_run = Cvar_Get( "cl_run", "1", 0 );
23302325
cl_mouseAccel = Cvar_Get( "cl_mouseAccel", "0", 0 );
2331-
cl_freelook = Cvar_Get( "cl_freelook", "1", CVAR_ARCHIVE );
23322326

23332327
// 0: legacy mouse acceleration
23342328
// 1: new implementation
@@ -2340,8 +2334,6 @@ void CL_Init()
23402334

23412335
cl_allowDownload = Cvar_Get( "cl_allowDownload", "1", 0 );
23422336

2343-
cl_doubletapdelay = Cvar_Get( "cl_doubletapdelay", "250", 0 ); // Arnout: double tap
2344-
23452337
cl_consoleFontKerning = Cvar_Get( "cl_consoleFontKerning", "0", 0 );
23462338

23472339
cl_consoleCommand = Cvar_Get( "cl_consoleCommand", "say", 0 );

‎src/engine/client/client.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -389,15 +389,15 @@ extern cvar_t *cl_showSend;
389389
extern cvar_t *cl_timeNudge;
390390
extern cvar_t *cl_showTimeDelta;
391391

392-
extern cvar_t *cl_yawspeed;
393-
extern cvar_t *cl_pitchspeed;
394-
extern cvar_t *cl_run;
395-
extern cvar_t *cl_anglespeedkey;
392+
extern Cvar::Cvar<float> cl_yawspeed;
393+
extern Cvar::Cvar<float> cl_pitchspeed;
394+
extern Cvar::Cvar<bool> cl_run;
395+
extern Cvar::Cvar<float> cl_anglespeedkey;
396396

397-
extern cvar_t *cl_doubletapdelay;
397+
extern Cvar::Range<Cvar::Cvar<int>> cl_doubletapdelay;
398398

399399
extern cvar_t *cl_sensitivity;
400-
extern cvar_t *cl_freelook;
400+
extern Cvar::Cvar<bool> cl_freelook;
401401

402402
extern cvar_t *cl_mouseAccel;
403403
extern cvar_t *cl_mouseAccelOffset;

0 commit comments

Comments
 (0)