zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor cleanups in MACT control.c

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3196 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-11-17 16:47:53 +00:00
parent 11a5000630
commit a5ee23215d
1 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
polymer/eduke32/source/jmact/control.c
View file

@ -18,6 +18,7 @@
#include "osd.h" #include "osd.h"
#include "pragmas.h" #include "pragmas.h"
#define CONTROL_CheckRange(which) ((uint32_t)which >= (uint32_t)CONTROL_NUM_FLAGS)
int32_t CONTROL_JoyPresent = FALSE; int32_t CONTROL_JoyPresent = FALSE;
int32_t CONTROL_JoystickEnabled = FALSE; int32_t CONTROL_JoystickEnabled = FALSE;
@ -81,20 +82,6 @@ static void CONTROL_GetMouseDelta(void)
CONTROL_MouseAxes[1].analog = (int32_t)((y * 4.0f * CONTROL_MouseSensitivity) * 2.0f); CONTROL_MouseAxes[1].analog = (int32_t)((y * 4.0f * CONTROL_MouseSensitivity) * 2.0f);
} }
static void CONTROL_GetJoyDelta(void)
{
int32_t i;
for (i=0; i<joynumaxes; i++)
CONTROL_JoyAxes[i].analog = joyaxis[i]; // >> 5;
}
static int32_t CONTROL_StartJoy(int32_t joy)
{
UNREFERENCED_PARAMETER(joy);
return (inputdevices & 4) == 4;
}
static int32_t CONTROL_GetTime(void) static int32_t CONTROL_GetTime(void)
{ {
static int32_t t = 0; static int32_t t = 0;
@ -102,14 +89,6 @@ static int32_t CONTROL_GetTime(void)
return t; return t;
} }
static inline int32_t CONTROL_CheckRange(int32_t which)
{
if ((uint32_t)which >= (uint32_t)CONTROL_NUM_FLAGS) return TRUE;
//Error("CONTROL_CheckRange: Index %d out of valid range for %d control flags.",
// which, CONTROL_NUM_FLAGS);
return FALSE;
}
static void CONTROL_SetFlag(int32_t which, int32_t active) static void CONTROL_SetFlag(int32_t which, int32_t active)
{ {
if (CONTROL_CheckRange(which)) return; if (CONTROL_CheckRange(which)) return;
@ -619,11 +598,12 @@ static void CONTROL_PollDevices(ControlInfo *info)
if (CONTROL_JoystickEnabled) if (CONTROL_JoystickEnabled)
{ {
int32_t i = MAXJOYAXES-1; int32_t i = joynumaxes-1;
CONTROL_GetJoyDelta();
for (; i>=0; i--) for (; i>=0; i--)
{ {
CONTROL_JoyAxes[i].analog = joyaxis[i];
CONTROL_DigitizeAxis(i, controldevice_joystick); CONTROL_DigitizeAxis(i, controldevice_joystick);
CONTROL_ScaleAxis(i, controldevice_joystick); CONTROL_ScaleAxis(i, controldevice_joystick);
LIMITCONTROL(&CONTROL_JoyAxes[i].analog); LIMITCONTROL(&CONTROL_JoyAxes[i].analog);
@ -824,8 +804,7 @@ int32_t CONTROL_Startup(controltype which, int32_t(*TimeFunction)(void), int32_t
// case controltype_keyboardandjoystick: // case controltype_keyboardandjoystick:
CONTROL_NumJoyAxes = min(MAXJOYAXES,joynumaxes); CONTROL_NumJoyAxes = min(MAXJOYAXES,joynumaxes);
CONTROL_NumJoyButtons = min(MAXJOYBUTTONS,joynumbuttons + 4*(joynumhats>0)); CONTROL_NumJoyButtons = min(MAXJOYBUTTONS,joynumbuttons + 4*(joynumhats>0));
CONTROL_JoyPresent = CONTROL_StartJoy(0); CONTROL_JoystickEnabled = CONTROL_JoyPresent = (inputdevices&4)>>2;
CONTROL_JoystickEnabled = CONTROL_JoyPresent;
// break; // break;
//} //}