qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-20 17:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

A few fixes + boundary checks

Browse source
This commit is contained in:
Johnny on Flame 2013-01-25 23:17:55 -02:00 committed by Bill Currie
parent 637d751aa7
commit 86e7392e7a
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libs/video/targets/joy.c
View file

@ -128,18 +128,18 @@ JOY_Move (void)
if (abs(ja->offset) + abs(ja->current) < abs(ja->offset) + abs(ja->deadzone))
ja->current = -ja->offset;
value = amp * ja->amp * (ja->offset + ja->current * pre * ja->pre_amp) / 120.0f;
value = amp * ja->amp * (ja->offset + ja->current * pre * ja->pre_amp) / 100.0f;
switch (ja->dest) {
case js_none:
// ignore axis
break;
case js_position:
if (ja->current)
viewdelta.position[ja->axis] += value;
viewdelta.position[(ja->axis) ? 2 : 0] += value;
break;
case js_angles:
if (ja->current)
viewdelta.angles[ja->axis] -= value;
viewdelta.angles[(ja->axis) ? 1 : 0] -= value;
break;
case js_button:
joy_check_axis_buttons (ja, value);
@ -305,6 +305,10 @@ in_joy_f (void)
case js_type:
joy_axes[ax].dest = JOY_GetDest_i (Cmd_Argv(i++));
joy_axes[ax].axis = strtol (Cmd_Argv(i++), NULL, 10);
if (joy_axes[ax].axis > 1 || joy_axes[ax].axis < 0) {
joy_axes[ax].axis = 0;
Sys_Printf("Invalid axis value.");
}
break;
case js_axis_button:
break;
@ -328,6 +332,14 @@ JOY_Init_Cvars (void)
joyamp_f, "Joystick pre-amplification");
Cmd_AddCommand("in_joy", in_joy_f, "Configures the joystick behaviour");
int i;
for (i=0;i<JOY_MAX_AXES;i++)
{
joy_axes[i].dest = js_none;
joy_axes[i].amp = 1;
joy_axes[i].pre_amp = 1;
joy_axes[i].deadzone = 7500;
}
}