mirror of
https://git.code.sf.net/p/quake/newtree
synced 2025-05-30 08:40:39 +00:00
CVAR_FIXME cleanup
This commit is contained in:
Anton E. Gavrilov
parent
6168fcebcc
commit
df980b44a1
13 changed files with 2 additions and 495 deletions
162
source/in_win.c
162
source/in_win.c
|
|
@ -64,8 +64,6 @@ static int mouse_oldbuttonstate;
|
|||
static POINT current_pos;
|
||||
static float old_mouse_x, old_mouse_y, mx_accum, my_accum;
|
||||
static qboolean mouseinitialized;
|
||||
/* static cvar_t m_filter = {"m_filter","0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *m_filter;
|
||||
static qboolean restore_spi;
|
||||
static int originalmouseparms[3], newmouseparms[3] = {0, 0, 1};
|
||||
|
|
@ -106,62 +104,24 @@ static PDWORD pdwRawValue[JOY_MAX_AXES];
|
|||
// each time. this avoids any problems with getting back to a default usage
|
||||
// or when changing from one controller to another. this way at least something
|
||||
// works.
|
||||
/* static cvar_t in_joystick = {"joystick","0", true};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *in_joystick;
|
||||
/* static cvar_t joy_name = {"joyname", "joystick"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_name;
|
||||
/* static cvar_t joy_advanced = {"joyadvanced", "0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_advanced;
|
||||
/* static cvar_t joy_advaxisx = {"joyadvaxisx", "0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_advaxisx;
|
||||
/* static cvar_t joy_advaxisy = {"joyadvaxisy", "0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_advaxisy;
|
||||
/* static cvar_t joy_advaxisz = {"joyadvaxisz", "0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_advaxisz;
|
||||
/* static cvar_t joy_advaxisr = {"joyadvaxisr", "0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_advaxisr;
|
||||
/* static cvar_t joy_advaxisu = {"joyadvaxisu", "0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_advaxisu;
|
||||
/* static cvar_t joy_advaxisv = {"joyadvaxisv", "0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_advaxisv;
|
||||
/* static cvar_t joy_forwardthreshold = {"joyforwardthreshold", "0.15"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_forwardthreshold;
|
||||
/* static cvar_t joy_sidethreshold = {"joysidethreshold", "0.15"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_sidethreshold;
|
||||
/* static cvar_t joy_pitchthreshold = {"joypitchthreshold", "0.15"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_pitchthreshold;
|
||||
/* static cvar_t joy_yawthreshold = {"joyyawthreshold", "0.15"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_yawthreshold;
|
||||
/* static cvar_t joy_forwardsensitivity = {"joyforwardsensitivity", "-1.0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_forwardsensitivity;
|
||||
/* static cvar_t joy_sidesensitivity = {"joysidesensitivity", "-1.0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_sidesensitivity;
|
||||
/* static cvar_t joy_pitchsensitivity = {"joypitchsensitivity", "1.0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_pitchsensitivity;
|
||||
/* static cvar_t joy_yawsensitivity = {"joyyawsensitivity", "-1.0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_yawsensitivity;
|
||||
/* static cvar_t joy_wwhack1 = {"joywwhack1", "0.0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_wwhack1;
|
||||
/* static cvar_t joy_wwhack2 = {"joywwhack2", "0.0"};
|
||||
CVAR_FIXME */
|
||||
static cvar_t *joy_wwhack2;
|
||||
|
||||
static qboolean joy_avail, joy_advancedinit, joy_haspov;
|
||||
|
|
@ -546,67 +506,27 @@ IN_Init
|
|||
void IN_Init (void)
|
||||
{
|
||||
// mouse variables
|
||||
/* Cvar_RegisterVariable (&m_filter);
|
||||
CVAR_FIXME */
|
||||
m_filter = Cvar_Get("m_filter", "0", CVAR_NONE, "None");
|
||||
|
||||
// joystick variables
|
||||
/* Cvar_RegisterVariable (&in_joystick);
|
||||
CVAR_FIXME */
|
||||
in_joystick = Cvar_Get("joystick", "0", CVAR_ARCHIVE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_name);
|
||||
CVAR_FIXME */
|
||||
joy_name = Cvar_Get("joyname", "joystick", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_advanced);
|
||||
CVAR_FIXME */
|
||||
joy_advanced = Cvar_Get("joyadvanced", "0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_advaxisx);
|
||||
CVAR_FIXME */
|
||||
joy_advaxisx = Cvar_Get("joyadvaxisx", "0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_advaxisy);
|
||||
CVAR_FIXME */
|
||||
joy_advaxisy = Cvar_Get("joyadvaxisy", "0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_advaxisz);
|
||||
CVAR_FIXME */
|
||||
joy_advaxisz = Cvar_Get("joyadvaxisz", "0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_advaxisr);
|
||||
CVAR_FIXME */
|
||||
joy_advaxisr = Cvar_Get("joyadvaxisr", "0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_advaxisu);
|
||||
CVAR_FIXME */
|
||||
joy_advaxisu = Cvar_Get("joyadvaxisu", "0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_advaxisv);
|
||||
CVAR_FIXME */
|
||||
joy_advaxisv = Cvar_Get("joyadvaxisv", "0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_forwardthreshold);
|
||||
CVAR_FIXME */
|
||||
joy_forwardthreshold = Cvar_Get("joyforwardthreshold", "0.15", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_sidethreshold);
|
||||
CVAR_FIXME */
|
||||
joy_sidethreshold = Cvar_Get("joysidethreshold", "0.15", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_pitchthreshold);
|
||||
CVAR_FIXME */
|
||||
joy_pitchthreshold = Cvar_Get("joypitchthreshold", "0.15", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_yawthreshold);
|
||||
CVAR_FIXME */
|
||||
joy_yawthreshold = Cvar_Get("joyyawthreshold", "0.15", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_forwardsensitivity);
|
||||
CVAR_FIXME */
|
||||
joy_forwardsensitivity = Cvar_Get("joyforwardsensitivity", "-1.0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_sidesensitivity);
|
||||
CVAR_FIXME */
|
||||
joy_sidesensitivity = Cvar_Get("joysidesensitivity", "-1.0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_pitchsensitivity);
|
||||
CVAR_FIXME */
|
||||
joy_pitchsensitivity = Cvar_Get("joypitchsensitivity", "1.0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_yawsensitivity);
|
||||
CVAR_FIXME */
|
||||
joy_yawsensitivity = Cvar_Get("joyyawsensitivity", "-1.0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_wwhack1);
|
||||
CVAR_FIXME */
|
||||
joy_wwhack1 = Cvar_Get("joywwhack1", "0.0", CVAR_NONE, "None");
|
||||
/* Cvar_RegisterVariable (&joy_wwhack2);
|
||||
CVAR_FIXME */
|
||||
joy_wwhack2 = Cvar_Get("joywwhack2", "0.0", CVAR_NONE, "None");
|
||||
|
||||
Cmd_AddCommand ("force_centerview", Force_CenterView_f);
|
||||
|
|
@ -779,8 +699,6 @@ void IN_MouseMove (usercmd_t *cmd)
|
|||
my_accum = 0;
|
||||
}
|
||||
|
||||
/* if (m_filter.value)
|
||||
CVAR_FIXME */
|
||||
if (m_filter->value)
|
||||
{
|
||||
mouse_x = (mx + old_mouse_x) * 0.5;
|
||||
|
|
@ -795,23 +713,13 @@ void IN_MouseMove (usercmd_t *cmd)
|
|||
old_mouse_x = mx;
|
||||
old_mouse_y = my;
|
||||
|
||||
/* mouse_x *= sensitivity.value;
|
||||
CVAR_FIXME */
|
||||
mouse_x *= sensitivity->value;
|
||||
/* mouse_y *= sensitivity.value;
|
||||
CVAR_FIXME */
|
||||
mouse_y *= sensitivity->value;
|
||||
|
||||
// add mouse X/Y movement to cmd
|
||||
/* if ( (in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1) ))
|
||||
CVAR_FIXME */
|
||||
if ( (in_strafe.state & 1) || (lookstrafe->value && freelook ))
|
||||
/* cmd->sidemove += m_side.value * mouse_x;
|
||||
CVAR_FIXME */
|
||||
cmd->sidemove += m_side->value * mouse_x;
|
||||
else
|
||||
/* cl.viewangles[YAW] -= m_yaw.value * mouse_x;
|
||||
CVAR_FIXME */
|
||||
cl.viewangles[YAW] -= m_yaw->value * mouse_x;
|
||||
|
||||
if (freelook)
|
||||
|
|
@ -819,8 +727,6 @@ void IN_MouseMove (usercmd_t *cmd)
|
|||
|
||||
if ( freelook && !(in_strafe.state & 1))
|
||||
{
|
||||
/* cl.viewangles[PITCH] += m_pitch.value * mouse_y;
|
||||
CVAR_FIXME */
|
||||
cl.viewangles[PITCH] += m_pitch->value * mouse_y;
|
||||
if (cl.viewangles[PITCH] > 80)
|
||||
cl.viewangles[PITCH] = 80;
|
||||
|
|
@ -830,12 +736,8 @@ void IN_MouseMove (usercmd_t *cmd)
|
|||
else
|
||||
{
|
||||
if ((in_strafe.state & 1) && noclip_anglehack)
|
||||
/* cmd->upmove -= m_forward.value * mouse_y;
|
||||
CVAR_FIXME */
|
||||
cmd->upmove -= m_forward->value * mouse_y;
|
||||
else
|
||||
/* cmd->forwardmove -= m_forward.value * mouse_y;
|
||||
CVAR_FIXME */
|
||||
cmd->forwardmove -= m_forward->value * mouse_y;
|
||||
}
|
||||
|
||||
|
|
@ -1018,8 +920,6 @@ static void Joy_AdvancedUpdate_f (void)
|
|||
pdwRawValue[i] = RawValuePointer(i);
|
||||
}
|
||||
|
||||
/* if( joy_advanced.value == 0.0)
|
||||
CVAR_FIXME */
|
||||
if( joy_advanced->value == 0.0)
|
||||
{
|
||||
// default joystick initialization
|
||||
|
|
@ -1039,33 +939,21 @@ static void Joy_AdvancedUpdate_f (void)
|
|||
|
||||
// advanced initialization here
|
||||
// data supplied by user via joy_axisn cvars
|
||||
/* dwTemp = (DWORD) joy_advaxisx.value;
|
||||
CVAR_FIXME */
|
||||
dwTemp = (DWORD) joy_advaxisx->value;
|
||||
dwAxisMap[JOY_AXIS_X] = dwTemp & 0x0000000f;
|
||||
dwControlMap[JOY_AXIS_X] = dwTemp & JOY_RELATIVE_AXIS;
|
||||
/* dwTemp = (DWORD) joy_advaxisy.value;
|
||||
CVAR_FIXME */
|
||||
dwTemp = (DWORD) joy_advaxisy->value;
|
||||
dwAxisMap[JOY_AXIS_Y] = dwTemp & 0x0000000f;
|
||||
dwControlMap[JOY_AXIS_Y] = dwTemp & JOY_RELATIVE_AXIS;
|
||||
/* dwTemp = (DWORD) joy_advaxisz.value;
|
||||
CVAR_FIXME */
|
||||
dwTemp = (DWORD) joy_advaxisz->value;
|
||||
dwAxisMap[JOY_AXIS_Z] = dwTemp & 0x0000000f;
|
||||
dwControlMap[JOY_AXIS_Z] = dwTemp & JOY_RELATIVE_AXIS;
|
||||
/* dwTemp = (DWORD) joy_advaxisr.value;
|
||||
CVAR_FIXME */
|
||||
dwTemp = (DWORD) joy_advaxisr->value;
|
||||
dwAxisMap[JOY_AXIS_R] = dwTemp & 0x0000000f;
|
||||
dwControlMap[JOY_AXIS_R] = dwTemp & JOY_RELATIVE_AXIS;
|
||||
/* dwTemp = (DWORD) joy_advaxisu.value;
|
||||
CVAR_FIXME */
|
||||
dwTemp = (DWORD) joy_advaxisu->value;
|
||||
dwAxisMap[JOY_AXIS_U] = dwTemp & 0x0000000f;
|
||||
dwControlMap[JOY_AXIS_U] = dwTemp & JOY_RELATIVE_AXIS;
|
||||
/* dwTemp = (DWORD) joy_advaxisv.value;
|
||||
CVAR_FIXME */
|
||||
dwTemp = (DWORD) joy_advaxisv->value;
|
||||
dwAxisMap[JOY_AXIS_V] = dwTemp & 0x0000000f;
|
||||
dwControlMap[JOY_AXIS_V] = dwTemp & JOY_RELATIVE_AXIS;
|
||||
|
|
@ -1170,8 +1058,6 @@ static qboolean IN_ReadJoystick (void)
|
|||
// this is a hack -- there is a bug in the Logitech WingMan Warrior DirectInput Driver
|
||||
// rather than having 32768 be the zero point, they have the zero point at 32668
|
||||
// go figure -- anyway, now we get the full resolution out of the device
|
||||
/* if (joy_wwhack1.value != 0.0)
|
||||
CVAR_FIXME */
|
||||
if (joy_wwhack1->value != 0.0)
|
||||
{
|
||||
ji.dwUpos += 100;
|
||||
|
|
@ -1210,8 +1096,6 @@ static void IN_JoyMove (usercmd_t *cmd)
|
|||
}
|
||||
|
||||
// verify joystick is available and that the user wants to use it
|
||||
/* if (!joy_avail || !in_joystick.value)
|
||||
CVAR_FIXME */
|
||||
if (!joy_avail || !in_joystick->value)
|
||||
{
|
||||
return;
|
||||
|
|
@ -1224,8 +1108,6 @@ static void IN_JoyMove (usercmd_t *cmd)
|
|||
}
|
||||
|
||||
if (in_speed.state & 1)
|
||||
/* speed = cl_movespeedkey.value;
|
||||
CVAR_FIXME */
|
||||
speed = cl_movespeedkey->value;
|
||||
else
|
||||
speed = 1;
|
||||
|
|
@ -1239,8 +1121,6 @@ static void IN_JoyMove (usercmd_t *cmd)
|
|||
// move centerpoint to zero
|
||||
fAxisValue -= 32768.0;
|
||||
|
||||
/* if (joy_wwhack2.value != 0.0)
|
||||
CVAR_FIXME */
|
||||
if (joy_wwhack2->value != 0.0)
|
||||
{
|
||||
if (dwAxisMap[i] == AxisTurn)
|
||||
|
|
@ -1263,29 +1143,19 @@ static void IN_JoyMove (usercmd_t *cmd)
|
|||
switch (dwAxisMap[i])
|
||||
{
|
||||
case AxisForward:
|
||||
/* if ((joy_advanced.value == 0.0) && (in_mlook.state & 1))
|
||||
CVAR_FIXME */
|
||||
if ((joy_advanced->value == 0.0) && freelook)
|
||||
{
|
||||
// user wants forward control to become look control
|
||||
/* if (fabs(fAxisValue) > joy_pitchthreshold.value)
|
||||
CVAR_FIXME */
|
||||
if (fabs(fAxisValue) > joy_pitchthreshold->value)
|
||||
{
|
||||
// if mouse invert is on, invert the joystick pitch value
|
||||
// only absolute control support here (joy_advanced is false)
|
||||
/* if (m_pitch.value < 0.0)
|
||||
CVAR_FIXME */
|
||||
if (m_pitch->value < 0.0)
|
||||
{
|
||||
/* cl.viewangles[PITCH] -= (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value;
|
||||
CVAR_FIXME */
|
||||
cl.viewangles[PITCH] -= (fAxisValue * joy_pitchsensitivity->value) * aspeed * cl_pitchspeed->value;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value;
|
||||
CVAR_FIXME */
|
||||
cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * aspeed * cl_pitchspeed->value;
|
||||
}
|
||||
V_StopPitchDrift();
|
||||
|
|
@ -1296,69 +1166,47 @@ static void IN_JoyMove (usercmd_t *cmd)
|
|||
// disable pitch return-to-center unless requested by user
|
||||
// *** this code can be removed when the lookspring bug is fixed
|
||||
// *** the bug always has the lookspring feature on
|
||||
/* if(lookspring.value == 0.0)
|
||||
CVAR_FIXME */
|
||||
if(lookspring->value == 0.0)
|
||||
if (lookspring->value == 0.0)
|
||||
V_StopPitchDrift();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// user wants forward control to be forward control
|
||||
/* if (fabs(fAxisValue) > joy_forwardthreshold.value)
|
||||
CVAR_FIXME */
|
||||
if (fabs(fAxisValue) > joy_forwardthreshold->value)
|
||||
{
|
||||
/* cmd->forwardmove += (fAxisValue * joy_forwardsensitivity.value) * speed * cl_forwardspeed.value;
|
||||
CVAR_FIXME */
|
||||
cmd->forwardmove += (fAxisValue * joy_forwardsensitivity->value) * speed * cl_forwardspeed->value;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case AxisSide:
|
||||
/* if (fabs(fAxisValue) > joy_sidethreshold.value)
|
||||
CVAR_FIXME */
|
||||
if (fabs(fAxisValue) > joy_sidethreshold->value)
|
||||
{
|
||||
/* cmd->sidemove += (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value;
|
||||
CVAR_FIXME */
|
||||
cmd->sidemove += (fAxisValue * joy_sidesensitivity->value) * speed * cl_sidespeed->value;
|
||||
}
|
||||
break;
|
||||
|
||||
case AxisTurn:
|
||||
/* if ((in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1)))
|
||||
CVAR_FIXME */
|
||||
if ((in_strafe.state & 1) || (lookstrafe->value && freelook))
|
||||
{
|
||||
// user wants turn control to become side control
|
||||
/* if (fabs(fAxisValue) > joy_sidethreshold.value)
|
||||
CVAR_FIXME */
|
||||
if (fabs(fAxisValue) > joy_sidethreshold->value)
|
||||
{
|
||||
/* cmd->sidemove -= (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value;
|
||||
CVAR_FIXME */
|
||||
cmd->sidemove -= (fAxisValue * joy_sidesensitivity->value) * speed * cl_sidespeed->value;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// user wants turn control to be turn control
|
||||
/* if (fabs(fAxisValue) > joy_yawthreshold.value)
|
||||
CVAR_FIXME */
|
||||
if (fabs(fAxisValue) > joy_yawthreshold->value)
|
||||
{
|
||||
if(dwControlMap[i] == JOY_ABSOLUTE_AXIS)
|
||||
{
|
||||
/* cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * aspeed * cl_yawspeed.value;
|
||||
CVAR_FIXME */
|
||||
cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity->value) * aspeed * cl_yawspeed->value;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * speed * 180.0;
|
||||
CVAR_FIXME */
|
||||
cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity->value) * speed * 180.0;
|
||||
}
|
||||
|
||||
|
|
@ -1369,21 +1217,15 @@ static void IN_JoyMove (usercmd_t *cmd)
|
|||
case AxisLook:
|
||||
if (freelook)
|
||||
{
|
||||
/* if (fabs(fAxisValue) > joy_pitchthreshold.value)
|
||||
CVAR_FIXME */
|
||||
if (fabs(fAxisValue) > joy_pitchthreshold->value)
|
||||
{
|
||||
// pitch movement detected and pitch movement desired by user
|
||||
if(dwControlMap[i] == JOY_ABSOLUTE_AXIS)
|
||||
{
|
||||
/* cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value;
|
||||
CVAR_FIXME */
|
||||
cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * aspeed * cl_pitchspeed->value;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * speed * 180.0;
|
||||
CVAR_FIXME */
|
||||
cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * speed * 180.0;
|
||||
}
|
||||
V_StopPitchDrift();
|
||||
|
|
@ -1394,8 +1236,6 @@ static void IN_JoyMove (usercmd_t *cmd)
|
|||
// disable pitch return-to-center unless requested by user
|
||||
// *** this code can be removed when the lookspring bug is fixed
|
||||
// *** the bug always has the lookspring feature on
|
||||
/* if(lookspring.value == 0.0)
|
||||
CVAR_FIXME */
|
||||
if(lookspring->value == 0.0)
|
||||
V_StopPitchDrift();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue