mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-16 01:11:44 +00:00
jmact/control.c: rewrite strange looking loop.
git-svn-id: https://svn.eduke32.com/eduke32@2334 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
f872d556d8
commit
09addc955c
1 changed files with 5 additions and 17 deletions
|
@ -625,19 +625,13 @@ void CONTROL_PollDevices(ControlInfo *info)
|
|||
int32_t i = MAXMOUSEAXES-1;
|
||||
|
||||
CONTROL_GetMouseDelta();
|
||||
do
|
||||
for (; i>=0; i--)
|
||||
{
|
||||
CONTROL_DigitizeAxis(i, controldevice_mouse);
|
||||
CONTROL_ScaleAxis(i, controldevice_mouse);
|
||||
LIMITCONTROL(&CONTROL_MouseAxes[i].analog);
|
||||
CONTROL_ApplyAxis(i, info, controldevice_mouse);
|
||||
}
|
||||
while (--i);
|
||||
|
||||
CONTROL_DigitizeAxis(0, controldevice_mouse);
|
||||
CONTROL_ScaleAxis(0, controldevice_mouse);
|
||||
LIMITCONTROL(&CONTROL_MouseAxes[0].analog);
|
||||
CONTROL_ApplyAxis(0, info, controldevice_mouse);
|
||||
}
|
||||
|
||||
if (CONTROL_JoystickEnabled)
|
||||
|
@ -645,19 +639,13 @@ void CONTROL_PollDevices(ControlInfo *info)
|
|||
int32_t i = MAXJOYAXES-1;
|
||||
|
||||
CONTROL_GetJoyDelta();
|
||||
do
|
||||
for (; i>=0; i--)
|
||||
{
|
||||
CONTROL_DigitizeAxis(i, controldevice_joystick);
|
||||
CONTROL_ScaleAxis(i, controldevice_joystick);
|
||||
LIMITCONTROL(&CONTROL_JoyAxes[i].analog);
|
||||
CONTROL_ApplyAxis(i, info, controldevice_joystick);
|
||||
}
|
||||
while (--i);
|
||||
|
||||
CONTROL_DigitizeAxis(0, controldevice_joystick);
|
||||
CONTROL_ScaleAxis(0, controldevice_joystick);
|
||||
LIMITCONTROL(&CONTROL_JoyAxes[0].analog);
|
||||
CONTROL_ApplyAxis(0, info, controldevice_joystick);
|
||||
}
|
||||
|
||||
CONTROL_GetDeviceButtons();
|
||||
|
@ -848,17 +836,17 @@ int32_t CONTROL_Startup(controltype which, int32_t(*TimeFunction)(void), int32_t
|
|||
// case controltype_keyboardandjoystick:
|
||||
CONTROL_NumJoyAxes = min(MAXJOYAXES,joynumaxes);
|
||||
CONTROL_NumJoyButtons = min(MAXJOYBUTTONS,joynumbuttons + 4*(joynumhats>0));
|
||||
CONTROL_JoyPresent = CONTROL_StartJoy(0);;
|
||||
CONTROL_JoyPresent = CONTROL_StartJoy(0);
|
||||
CONTROL_JoystickEnabled = CONTROL_JoyPresent;
|
||||
// break;
|
||||
//}
|
||||
|
||||
/*
|
||||
#if 0
|
||||
if (CONTROL_MousePresent)
|
||||
initprintf("CONTROL_Startup: Mouse Present\n");
|
||||
if (CONTROL_JoyPresent)
|
||||
initprintf("CONTROL_Startup: Joystick Present\n");
|
||||
*/
|
||||
#endif
|
||||
|
||||
CONTROL_ButtonState = 0;
|
||||
CONTROL_ButtonHeldState = 0;
|
||||
|
|
Loading…
Reference in a new issue