iikorni/quakespasm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More conversion

Browse Source
This commit is contained in:
iikorni
2026-08-29 19:17:46 -05:00
parent 0404d430dc
commit 70e5c02355
72 changed files with 13308 additions and 14309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Quake/cl_input.cpp
+51 -52
View File
@@ -26,8 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "quakedef.hpp"
extern cvar_t cl_maxpitch; //johnfitz -- variable pitch clamping
extern cvar_t cl_minpitch; //johnfitz -- variable pitch clamping
extern convar cl_maxpitch; //johnfitz -- variable pitch clamping
extern convar cl_minpitch; //johnfitz -- variable pitch clamping
/*
===============================================================================
@@ -63,11 +63,10 @@ int in_impulse;
void KeyDown (kbutton_t *b)
{
int k;
const char *c;
c = Cmd_Argv(1);
if (c[0])
k = atoi(c);
auto c = command::argv(1).value_or("");
if (!c.empty())
k = atoi(c.c_str());
else
k = -1; // typed manually at the console for continuous down
@@ -94,7 +93,7 @@ void KeyUp (kbutton_t *b)
int k;
const char *c;
c = Cmd_Argv(1);
c = command::argv(1)->c_str();
if (c[0])
k = atoi(c);
else
@@ -161,7 +160,7 @@ void IN_UseUp (void) {KeyUp(&in_use);}
void IN_JumpDown (void) {KeyDown(&in_jump);}
void IN_JumpUp (void) {KeyUp(&in_jump);}
void IN_Impulse (void) {in_impulse=Q_atoi(Cmd_Argv(1));}
void IN_Impulse (void) {in_impulse=Q_atoi(command::argv(1)->c_str());}
/*
===============
@@ -220,19 +219,19 @@ float CL_KeyState (kbutton_t *key)
//==========================================================================
cvar_t cl_upspeed = {"cl_upspeed","200",CVAR_NONE};
cvar_t cl_forwardspeed = {"cl_forwardspeed","200", CVAR_ARCHIVE};
cvar_t cl_backspeed = {"cl_backspeed","200", CVAR_ARCHIVE};
cvar_t cl_sidespeed = {"cl_sidespeed","350",CVAR_NONE};
convar cl_upspeed{"cl_upspeed","200"};
convar cl_forwardspeed{"cl_forwardspeed","200", {.archive = true}};
convar cl_backspeed{"cl_backspeed","200", {.archive = true}};
convar cl_sidespeed{"cl_sidespeed","350"};
cvar_t cl_movespeedkey = {"cl_movespeedkey","2.0",CVAR_NONE};
convar cl_movespeedkey{"cl_movespeedkey","2.0"};
cvar_t cl_yawspeed = {"cl_yawspeed","140",CVAR_NONE};
cvar_t cl_pitchspeed = {"cl_pitchspeed","150",CVAR_NONE};
convar cl_yawspeed{"cl_yawspeed","140"};
convar cl_pitchspeed{"cl_pitchspeed","150"};
cvar_t cl_anglespeedkey = {"cl_anglespeedkey","1.5",CVAR_NONE};
convar cl_anglespeedkey{"cl_anglespeedkey","1.5"};
cvar_t cl_alwaysrun = {"cl_alwaysrun","0",CVAR_ARCHIVE}; // QuakeSpasm -- new always run
convar cl_alwaysrun{"cl_alwaysrun","0",{.archive = true}}; // QuakeSpasm -- new always run
/*
================
@@ -414,41 +413,41 @@ CL_InitInput
*/
void CL_InitInput (void)
{
Cmd_AddCommand ("+moveup",IN_UpDown);
Cmd_AddCommand ("-moveup",IN_UpUp);
Cmd_AddCommand ("+movedown",IN_DownDown);
Cmd_AddCommand ("-movedown",IN_DownUp);
Cmd_AddCommand ("+left",IN_LeftDown);
Cmd_AddCommand ("-left",IN_LeftUp);
Cmd_AddCommand ("+right",IN_RightDown);
Cmd_AddCommand ("-right",IN_RightUp);
Cmd_AddCommand ("+forward",IN_ForwardDown);
Cmd_AddCommand ("-forward",IN_ForwardUp);
Cmd_AddCommand ("+back",IN_BackDown);
Cmd_AddCommand ("-back",IN_BackUp);
Cmd_AddCommand ("+lookup", IN_LookupDown);
Cmd_AddCommand ("-lookup", IN_LookupUp);
Cmd_AddCommand ("+lookdown", IN_LookdownDown);
Cmd_AddCommand ("-lookdown", IN_LookdownUp);
Cmd_AddCommand ("+strafe", IN_StrafeDown);
Cmd_AddCommand ("-strafe", IN_StrafeUp);
Cmd_AddCommand ("+moveleft", IN_MoveleftDown);
Cmd_AddCommand ("-moveleft", IN_MoveleftUp);
Cmd_AddCommand ("+moveright", IN_MoverightDown);
Cmd_AddCommand ("-moveright", IN_MoverightUp);
Cmd_AddCommand ("+speed", IN_SpeedDown);
Cmd_AddCommand ("-speed", IN_SpeedUp);
Cmd_AddCommand ("+attack", IN_AttackDown);
Cmd_AddCommand ("-attack", IN_AttackUp);
Cmd_AddCommand ("+use", IN_UseDown);
Cmd_AddCommand ("-use", IN_UseUp);
Cmd_AddCommand ("+jump", IN_JumpDown);
Cmd_AddCommand ("-jump", IN_JumpUp);
Cmd_AddCommand ("impulse", IN_Impulse);
Cmd_AddCommand ("+klook", IN_KLookDown);
Cmd_AddCommand ("-klook", IN_KLookUp);
Cmd_AddCommand ("+mlook", IN_MLookDown);
Cmd_AddCommand ("-mlook", IN_MLookUp);
command::add ("+moveup",IN_UpDown);
command::add ("-moveup",IN_UpUp);
command::add ("+movedown",IN_DownDown);
command::add ("-movedown",IN_DownUp);
command::add ("+left",IN_LeftDown);
command::add ("-left",IN_LeftUp);
command::add ("+right",IN_RightDown);
command::add ("-right",IN_RightUp);
command::add ("+forward",IN_ForwardDown);
command::add ("-forward",IN_ForwardUp);
command::add ("+back",IN_BackDown);
command::add ("-back",IN_BackUp);
command::add ("+lookup", IN_LookupDown);
command::add ("-lookup", IN_LookupUp);
command::add ("+lookdown", IN_LookdownDown);
command::add ("-lookdown", IN_LookdownUp);
command::add ("+strafe", IN_StrafeDown);
command::add ("-strafe", IN_StrafeUp);
command::add ("+moveleft", IN_MoveleftDown);
command::add ("-moveleft", IN_MoveleftUp);
command::add ("+moveright", IN_MoverightDown);
command::add ("-moveright", IN_MoverightUp);
command::add ("+speed", IN_SpeedDown);
command::add ("-speed", IN_SpeedUp);
command::add ("+attack", IN_AttackDown);
command::add ("-attack", IN_AttackUp);
command::add ("+use", IN_UseDown);
command::add ("-use", IN_UseUp);
command::add ("+jump", IN_JumpDown);
command::add ("-jump", IN_JumpUp);
command::add ("impulse", IN_Impulse);
command::add ("+klook", IN_KLookDown);
command::add ("-klook", IN_KLookUp);
command::add ("+mlook", IN_MLookDown);
command::add ("-mlook", IN_MLookUp);
}