diff --git a/polymer/build/src/sdlayer.c b/polymer/build/src/sdlayer.c
index b78a92bc7..e1e59007d 100644
--- a/polymer/build/src/sdlayer.c
+++ b/polymer/build/src/sdlayer.c
@@ -353,6 +353,7 @@ int initinput(void)
joydev = SDL_JoystickOpen(0);
if (joydev) {
SDL_JoystickEventState(SDL_ENABLE);
+ inputdevices |= 4;
joynumaxes = SDL_JoystickNumAxes(joydev);
joynumbuttons = min(32,SDL_JoystickNumButtons(joydev));
diff --git a/polymer/eduke32/source/jmact/control.c b/polymer/eduke32/source/jmact/control.c
index 718f6c616..59d554ff3 100644
--- a/polymer/eduke32/source/jmact/control.c
+++ b/polymer/eduke32/source/jmact/control.c
@@ -35,14 +35,14 @@ static int32 CONTROL_NumJoyButtons = 0;
static int32 CONTROL_NumJoyAxes = 0;
static controlflags CONTROL_Flags[CONTROL_NUM_FLAGS];
static controlbuttontype CONTROL_MouseButtonMapping[MAXMOUSEBUTTONS],
- CONTROL_JoyButtonMapping[MAXJOYBUTTONS];
+CONTROL_JoyButtonMapping[MAXJOYBUTTONS];
static controlkeymaptype CONTROL_KeyMapping[CONTROL_NUM_FLAGS];
static controlaxismaptype CONTROL_MouseAxesMap[MAXMOUSEAXES], // maps physical axes onto virtual ones
- CONTROL_JoyAxesMap[MAXJOYAXES];
+CONTROL_JoyAxesMap[MAXJOYAXES];
static controlaxistype CONTROL_MouseAxes[MAXMOUSEAXES], // physical axes
- CONTROL_JoyAxes[MAXJOYAXES];
+CONTROL_JoyAxes[MAXJOYAXES];
static controlaxistype CONTROL_LastMouseAxes[MAXMOUSEAXES],
- CONTROL_LastJoyAxes[MAXJOYAXES];
+CONTROL_LastJoyAxes[MAXJOYAXES];
static int32 CONTROL_MouseAxesScale[MAXMOUSEAXES], CONTROL_JoyAxesScale[MAXJOYAXES];
static int32 CONTROL_MouseButtonState[MAXMOUSEBUTTONS], CONTROL_JoyButtonState[MAXJOYBUTTONS];
static int32 CONTROL_MouseButtonClickedTime[MAXMOUSEBUTTONS], CONTROL_JoyButtonClickedTime[MAXJOYBUTTONS];
@@ -58,19 +58,19 @@ static int32 CONTROL_DoubleClickSpeed;
void CONTROL_GetMouseDelta(void)
{
- int32 x,y;
+ int32 x,y;
- MOUSE_GetDelta(&x, &y);
+ MOUSE_GetDelta(&x, &y);
- /* What in the name of all things sacred is this?
- if (labs(*x) > labs(*y)) {
- *x /= 3;
- } else {
- *y /= 3;
- }
- *y = *y * 96;
- *x = (*x * 32 * CONTROL_MouseSensitivity) >> 15;
- */
+ /* What in the name of all things sacred is this?
+ if (labs(*x) > labs(*y)) {
+ *x /= 3;
+ } else {
+ *y /= 3;
+ }
+ *y = *y * 96;
+ *x = (*x * 32 * CONTROL_MouseSensitivity) >> 15;
+ */
CONTROL_MouseAxes[0].analog = (x * (CONTROL_MouseSensitivity<<1));
CONTROL_MouseAxes[1].analog = (y * (CONTROL_MouseSensitivity<<1))<<1;
@@ -78,18 +78,18 @@ void CONTROL_GetMouseDelta(void)
int32 CONTROL_GetMouseSensitivity(void)
{
- return (CONTROL_MouseSensitivity);
+ return (CONTROL_MouseSensitivity);
}
void CONTROL_SetMouseSensitivity(int32 newsensitivity)
{
- CONTROL_MouseSensitivity = newsensitivity;
+ CONTROL_MouseSensitivity = newsensitivity;
}
boolean CONTROL_StartMouse(void)
{
- CONTROL_NumMouseButtons = MAXMOUSEBUTTONS;
- return MOUSE_Init();
+ CONTROL_NumMouseButtons = MAXMOUSEBUTTONS;
+ return MOUSE_Init();
}
void CONTROL_GetJoyAbs( void )
@@ -102,10 +102,10 @@ void CONTROL_FilterJoyDelta(void)
void CONTROL_GetJoyDelta( void )
{
- int32 i;
-
- for (i=0; i<joynumaxes; i++)
- CONTROL_JoyAxes[i].analog = joyaxis[i] >> 5;
+ int32 i;
+
+ for (i=0; i<joynumaxes; i++)
+ CONTROL_JoyAxes[i].analog = joyaxis[i] >> 5;
}
@@ -114,597 +114,597 @@ void CONTROL_SetJoyScale( void )
}
void CONTROL_CenterJoystick
- (
- void ( *CenterCenter )( void ),
- void ( *UpperLeft )( void ),
- void ( *LowerRight )( void ),
- void ( *CenterThrottle )( void ),
- void ( *CenterRudder )( void )
- )
+(
+ void ( *CenterCenter )( void ),
+ void ( *UpperLeft )( void ),
+ void ( *LowerRight )( void ),
+ void ( *CenterThrottle )( void ),
+ void ( *CenterRudder )( void )
+)
{
}
boolean CONTROL_StartJoy(int32 joy)
{
- return (inputdevices & 3) == 3;
+ return (inputdevices & 4) == 4;
}
void CONTROL_ShutJoy(int32 joy)
{
- CONTROL_JoyPresent = false;
+ CONTROL_JoyPresent = false;
}
int32 CONTROL_GetTime(void)
{
- static int32 t = 0;
- t += 5;
- return t;
+ static int32 t = 0;
+ t += 5;
+ return t;
}
boolean CONTROL_CheckRange(int32 which)
{
- if ((uint32)which < (uint32)CONTROL_NUM_FLAGS) return false;
- //Error("CONTROL_CheckRange: Index %d out of valid range for %d control flags.",
- // which, CONTROL_NUM_FLAGS);
- return true;
+ if ((uint32)which < (uint32)CONTROL_NUM_FLAGS) return false;
+ //Error("CONTROL_CheckRange: Index %d out of valid range for %d control flags.",
+ // which, CONTROL_NUM_FLAGS);
+ return true;
}
void CONTROL_SetFlag(int32 which, boolean active)
{
- if (CONTROL_CheckRange(which)) return;
+ if (CONTROL_CheckRange(which)) return;
- if (CONTROL_Flags[which].toggle == INSTANT_ONOFF) {
- CONTROL_Flags[which].active = active;
- } else {
- if (active) {
- CONTROL_Flags[which].buttonheld = false;
- } else if (CONTROL_Flags[which].buttonheld == false) {
- CONTROL_Flags[which].buttonheld = true;
- CONTROL_Flags[which].active = (CONTROL_Flags[which].active ? false : true);
- }
- }
+ if (CONTROL_Flags[which].toggle == INSTANT_ONOFF) {
+ CONTROL_Flags[which].active = active;
+ } else {
+ if (active) {
+ CONTROL_Flags[which].buttonheld = false;
+ } else if (CONTROL_Flags[which].buttonheld == false) {
+ CONTROL_Flags[which].buttonheld = true;
+ CONTROL_Flags[which].active = (CONTROL_Flags[which].active ? false : true);
+ }
+ }
}
boolean CONTROL_KeyboardFunctionPressed(int32 which)
{
- boolean key1 = 0, key2 = 0;
+ boolean key1 = 0, key2 = 0;
- if (CONTROL_CheckRange(which)) return false;
+ if (CONTROL_CheckRange(which)) return false;
- if (!CONTROL_Flags[which].used) return false;
+ if (!CONTROL_Flags[which].used) return false;
- if (CONTROL_KeyMapping[which].key1 != KEYUNDEFINED)
- key1 = KB_KeyDown[ CONTROL_KeyMapping[which].key1 ] ? true : false;
+ if (CONTROL_KeyMapping[which].key1 != KEYUNDEFINED)
+ key1 = KB_KeyDown[ CONTROL_KeyMapping[which].key1 ] ? true : false;
- if (CONTROL_KeyMapping[which].key2 != KEYUNDEFINED)
- key2 = KB_KeyDown[ CONTROL_KeyMapping[which].key2 ] ? true : false;
+ if (CONTROL_KeyMapping[which].key2 != KEYUNDEFINED)
+ key2 = KB_KeyDown[ CONTROL_KeyMapping[which].key2 ] ? true : false;
- return (key1 | key2);
+ return (key1 | key2);
}
void CONTROL_ClearKeyboardFunction(int32 which)
{
- if (CONTROL_CheckRange(which)) return;
+ if (CONTROL_CheckRange(which)) return;
- if (!CONTROL_Flags[which].used) return;
+ if (!CONTROL_Flags[which].used) return;
- if (CONTROL_KeyMapping[which].key1 != KEYUNDEFINED)
- KB_KeyDown[ CONTROL_KeyMapping[which].key1 ] = 0;
+ if (CONTROL_KeyMapping[which].key1 != KEYUNDEFINED)
+ KB_KeyDown[ CONTROL_KeyMapping[which].key1 ] = 0;
- if (CONTROL_KeyMapping[which].key2 != KEYUNDEFINED)
- KB_KeyDown[ CONTROL_KeyMapping[which].key2 ] = 0;
+ if (CONTROL_KeyMapping[which].key2 != KEYUNDEFINED)
+ KB_KeyDown[ CONTROL_KeyMapping[which].key2 ] = 0;
}
void CONTROL_DefineFlag( int32 which, boolean toggle )
{
- if (CONTROL_CheckRange(which)) return;
+ if (CONTROL_CheckRange(which)) return;
- CONTROL_Flags[which].active = false;
- CONTROL_Flags[which].used = true;
- CONTROL_Flags[which].toggle = toggle;
- CONTROL_Flags[which].buttonheld = false;
- CONTROL_Flags[which].cleared = 0;
+ CONTROL_Flags[which].active = false;
+ CONTROL_Flags[which].used = true;
+ CONTROL_Flags[which].toggle = toggle;
+ CONTROL_Flags[which].buttonheld = false;
+ CONTROL_Flags[which].cleared = 0;
}
boolean CONTROL_FlagActive( int32 which )
{
- if (CONTROL_CheckRange(which)) return false;
+ if (CONTROL_CheckRange(which)) return false;
- return CONTROL_Flags[which].used;
+ return CONTROL_Flags[which].used;
}
void CONTROL_MapKey( int32 which, kb_scancode key1, kb_scancode key2 )
{
- if (CONTROL_CheckRange(which)) return;
+ if (CONTROL_CheckRange(which)) return;
- CONTROL_KeyMapping[which].key1 = key1 ? key1 : KEYUNDEFINED;
- CONTROL_KeyMapping[which].key2 = key2 ? key2 : KEYUNDEFINED;
+ CONTROL_KeyMapping[which].key1 = key1 ? key1 : KEYUNDEFINED;
+ CONTROL_KeyMapping[which].key2 = key2 ? key2 : KEYUNDEFINED;
}
void CONTROL_PrintKeyMap(void)
{
- int32 i;
+ int32 i;
- for (i=0;i<CONTROL_NUM_FLAGS;i++) {
- initprintf("function %2ld key1=%3x key2=%3x\n",
- i, CONTROL_KeyMapping[i].key1, CONTROL_KeyMapping[i].key2);
- }
+ for (i=0;i<CONTROL_NUM_FLAGS;i++) {
+ initprintf("function %2ld key1=%3x key2=%3x\n",
+ i, CONTROL_KeyMapping[i].key1, CONTROL_KeyMapping[i].key2);
+ }
}
void CONTROL_PrintControlFlag(int32 which)
{
- initprintf("function %2ld active=%d used=%d toggle=%d buttonheld=%d cleared=%ld\n",
- which, CONTROL_Flags[which].active, CONTROL_Flags[which].used,
- CONTROL_Flags[which].toggle, CONTROL_Flags[which].buttonheld,
- CONTROL_Flags[which].cleared);
+ initprintf("function %2ld active=%d used=%d toggle=%d buttonheld=%d cleared=%ld\n",
+ which, CONTROL_Flags[which].active, CONTROL_Flags[which].used,
+ CONTROL_Flags[which].toggle, CONTROL_Flags[which].buttonheld,
+ CONTROL_Flags[which].cleared);
}
void CONTROL_PrintAxes(void)
{
- int32 i;
+ int32 i;
- initprintf("nummouseaxes=%ld\n", CONTROL_NumMouseAxes);
- for (i=0;i<CONTROL_NumMouseAxes;i++) {
- initprintf("axis=%ld analog=%d digital1=%d digital2=%d\n",
- i, CONTROL_MouseAxesMap[i].analogmap,
- CONTROL_MouseAxesMap[i].minmap, CONTROL_MouseAxesMap[i].maxmap);
- }
+ initprintf("nummouseaxes=%ld\n", CONTROL_NumMouseAxes);
+ for (i=0;i<CONTROL_NumMouseAxes;i++) {
+ initprintf("axis=%ld analog=%d digital1=%d digital2=%d\n",
+ i, CONTROL_MouseAxesMap[i].analogmap,
+ CONTROL_MouseAxesMap[i].minmap, CONTROL_MouseAxesMap[i].maxmap);
+ }
- initprintf("numjoyaxes=%ld\n", CONTROL_NumJoyAxes);
- for (i=0;i<CONTROL_NumJoyAxes;i++) {
- initprintf("axis=%ld analog=%d digital1=%d digital2=%d\n",
- i, CONTROL_JoyAxesMap[i].analogmap,
- CONTROL_JoyAxesMap[i].minmap, CONTROL_JoyAxesMap[i].maxmap);
- }
+ initprintf("numjoyaxes=%ld\n", CONTROL_NumJoyAxes);
+ for (i=0;i<CONTROL_NumJoyAxes;i++) {
+ initprintf("axis=%ld analog=%d digital1=%d digital2=%d\n",
+ i, CONTROL_JoyAxesMap[i].analogmap,
+ CONTROL_JoyAxesMap[i].minmap, CONTROL_JoyAxesMap[i].maxmap);
+ }
}
void CONTROL_MapButton( int32 whichfunction, int32 whichbutton, boolean doubleclicked, controldevice device )
{
- controlbuttontype *set;
-
- if (CONTROL_CheckRange(whichfunction)) whichfunction = BUTTONUNDEFINED;
+ controlbuttontype *set;
- switch (device) {
- case controldevice_mouse:
- if ((uint32)whichbutton >= (uint32)MAXMOUSEBUTTONS) {
- //Error("CONTROL_MapButton: button %d out of valid range for %d mouse buttons.",
- // whichbutton, CONTROL_NumMouseButtons);
- return;
- }
- set = CONTROL_MouseButtonMapping;
- break;
+ if (CONTROL_CheckRange(whichfunction)) whichfunction = BUTTONUNDEFINED;
- case controldevice_joystick:
- if ((uint32)whichbutton >= (uint32)MAXJOYBUTTONS) {
- //Error("CONTROL_MapButton: button %d out of valid range for %d joystick buttons.",
- // whichbutton, CONTROL_NumJoyButtons);
- return;
- }
- set = CONTROL_JoyButtonMapping;
- break;
+ switch (device) {
+ case controldevice_mouse:
+ if ((uint32)whichbutton >= (uint32)MAXMOUSEBUTTONS) {
+ //Error("CONTROL_MapButton: button %d out of valid range for %d mouse buttons.",
+ // whichbutton, CONTROL_NumMouseButtons);
+ return;
+ }
+ set = CONTROL_MouseButtonMapping;
+ break;
- default:
- //Error("CONTROL_MapButton: invalid controller device type");
- return;
- }
-
- if (doubleclicked)
- set[whichbutton].doubleclicked = whichfunction;
- else
- set[whichbutton].singleclicked = whichfunction;
+ case controldevice_joystick:
+ if ((uint32)whichbutton >= (uint32)MAXJOYBUTTONS) {
+ //Error("CONTROL_MapButton: button %d out of valid range for %d joystick buttons.",
+ // whichbutton, CONTROL_NumJoyButtons);
+ return;
+ }
+ set = CONTROL_JoyButtonMapping;
+ break;
+
+ default:
+ //Error("CONTROL_MapButton: invalid controller device type");
+ return;
+ }
+
+ if (doubleclicked)
+ set[whichbutton].doubleclicked = whichfunction;
+ else
+ set[whichbutton].singleclicked = whichfunction;
}
void CONTROL_MapAnalogAxis( int32 whichaxis, int32 whichanalog, controldevice device )
{
- controlaxismaptype *set;
+ controlaxismaptype *set;
- if ((uint32)whichanalog >= (uint32)analog_maxtype) {
- //Error("CONTROL_MapAnalogAxis: analog function %d out of valid range for %d analog functions.",
- // whichanalog, analog_maxtype);
- return;
- }
+ if ((uint32)whichanalog >= (uint32)analog_maxtype) {
+ //Error("CONTROL_MapAnalogAxis: analog function %d out of valid range for %d analog functions.",
+ // whichanalog, analog_maxtype);
+ return;
+ }
- switch (device) {
- case controldevice_mouse:
- if ((uint32)whichaxis >= (uint32)MAXMOUSEAXES) {
- //Error("CONTROL_MapAnalogAxis: axis %d out of valid range for %d mouse axes.",
- // whichaxis, MAXMOUSEAXES);
- return;
- }
+ switch (device) {
+ case controldevice_mouse:
+ if ((uint32)whichaxis >= (uint32)MAXMOUSEAXES) {
+ //Error("CONTROL_MapAnalogAxis: axis %d out of valid range for %d mouse axes.",
+ // whichaxis, MAXMOUSEAXES);
+ return;
+ }
- set = CONTROL_MouseAxesMap;
- break;
+ set = CONTROL_MouseAxesMap;
+ break;
- case controldevice_joystick:
- if ((uint32)whichaxis >= (uint32)MAXJOYAXES) {
- //Error("CONTROL_MapAnalogAxis: axis %d out of valid range for %d joystick axes.",
- // whichaxis, MAXJOYAXES);
- return;
- }
+ case controldevice_joystick:
+ if ((uint32)whichaxis >= (uint32)MAXJOYAXES) {
+ //Error("CONTROL_MapAnalogAxis: axis %d out of valid range for %d joystick axes.",
+ // whichaxis, MAXJOYAXES);
+ return;
+ }
- set = CONTROL_JoyAxesMap;
- break;
+ set = CONTROL_JoyAxesMap;
+ break;
- default:
- //Error("CONTROL_MapAnalogAxis: invalid controller device type");
- return;
- }
+ default:
+ //Error("CONTROL_MapAnalogAxis: invalid controller device type");
+ return;
+ }
- set[whichaxis].analogmap = whichanalog;
+ set[whichaxis].analogmap = whichanalog;
}
void CONTROL_SetAnalogAxisScale( int32 whichaxis, int32 axisscale, controldevice device )
{
- int32 *set;
+ int32 *set;
- switch (device) {
- case controldevice_mouse:
- if ((uint32)whichaxis >= (uint32)MAXMOUSEAXES) {
- //Error("CONTROL_SetAnalogAxisScale: axis %d out of valid range for %d mouse axes.",
- // whichaxis, MAXMOUSEAXES);
- return;
- }
+ switch (device) {
+ case controldevice_mouse:
+ if ((uint32)whichaxis >= (uint32)MAXMOUSEAXES) {
+ //Error("CONTROL_SetAnalogAxisScale: axis %d out of valid range for %d mouse axes.",
+ // whichaxis, MAXMOUSEAXES);
+ return;
+ }
- set = CONTROL_MouseAxesScale;
- break;
+ set = CONTROL_MouseAxesScale;
+ break;
- case controldevice_joystick:
- if ((uint32)whichaxis >= (uint32)MAXJOYAXES) {
- //Error("CONTROL_SetAnalogAxisScale: axis %d out of valid range for %d joystick axes.",
- // whichaxis, MAXJOYAXES);
- return;
- }
+ case controldevice_joystick:
+ if ((uint32)whichaxis >= (uint32)MAXJOYAXES) {
+ //Error("CONTROL_SetAnalogAxisScale: axis %d out of valid range for %d joystick axes.",
+ // whichaxis, MAXJOYAXES);
+ return;
+ }
- set = CONTROL_JoyAxesScale;
- break;
+ set = CONTROL_JoyAxesScale;
+ break;
- default:
- //Error("CONTROL_SetAnalogAxisScale: invalid controller device type");
- return;
- }
-
- set[whichaxis] = axisscale;
+ default:
+ //Error("CONTROL_SetAnalogAxisScale: invalid controller device type");
+ return;
+ }
+
+ set[whichaxis] = axisscale;
}
void CONTROL_MapDigitalAxis( int32 whichaxis, int32 whichfunction, int32 direction, controldevice device )
{
- controlaxismaptype *set;
+ controlaxismaptype *set;
- if (CONTROL_CheckRange(whichfunction)) whichfunction = AXISUNDEFINED;
+ if (CONTROL_CheckRange(whichfunction)) whichfunction = AXISUNDEFINED;
- switch (device) {
- case controldevice_mouse:
- if ((uint32)whichaxis >= (uint32)MAXMOUSEAXES) {
- //Error("CONTROL_MapDigitalAxis: axis %d out of valid range for %d mouse axes.",
- // whichaxis, MAXMOUSEAXES);
- return;
- }
+ switch (device) {
+ case controldevice_mouse:
+ if ((uint32)whichaxis >= (uint32)MAXMOUSEAXES) {
+ //Error("CONTROL_MapDigitalAxis: axis %d out of valid range for %d mouse axes.",
+ // whichaxis, MAXMOUSEAXES);
+ return;
+ }
- set = CONTROL_MouseAxesMap;
- break;
+ set = CONTROL_MouseAxesMap;
+ break;
- case controldevice_joystick:
- if ((uint32)whichaxis >= (uint32)MAXJOYAXES) {
- //Error("CONTROL_MapDigitalAxis: axis %d out of valid range for %d joystick axes.",
- // whichaxis, MAXJOYAXES);
- return;
- }
+ case controldevice_joystick:
+ if ((uint32)whichaxis >= (uint32)MAXJOYAXES) {
+ //Error("CONTROL_MapDigitalAxis: axis %d out of valid range for %d joystick axes.",
+ // whichaxis, MAXJOYAXES);
+ return;
+ }
- set = CONTROL_JoyAxesMap;
- break;
+ set = CONTROL_JoyAxesMap;
+ break;
- default:
- //Error("CONTROL_MapDigitalAxis: invalid controller device type");
- return;
- }
-
- switch (direction) { // JBF: this is all very much a guess. The ASM puzzles me.
- case axis_up:
- case axis_left:
- set[whichaxis].minmap = whichfunction;
- break;
- case axis_down:
- case axis_right:
- set[whichaxis].maxmap = whichfunction;
- break;
- default:
- break;
- }
+ default:
+ //Error("CONTROL_MapDigitalAxis: invalid controller device type");
+ return;
+ }
+
+ switch (direction) { // JBF: this is all very much a guess. The ASM puzzles me.
+ case axis_up:
+ case axis_left:
+ set[whichaxis].minmap = whichfunction;
+ break;
+ case axis_down:
+ case axis_right:
+ set[whichaxis].maxmap = whichfunction;
+ break;
+ default:
+ break;
+ }
}
void CONTROL_ClearFlags(void)
{
- int32 i;
+ int32 i;
- for (i=0;i<CONTROL_NUM_FLAGS;i++)
- CONTROL_Flags[i].used = false;
+ for (i=0;i<CONTROL_NUM_FLAGS;i++)
+ CONTROL_Flags[i].used = false;
}
void CONTROL_ClearAssignments( void )
{
- int32 i;
+ int32 i;
- memset(CONTROL_MouseButtonMapping, BUTTONUNDEFINED, sizeof(CONTROL_MouseButtonMapping));
- memset(CONTROL_JoyButtonMapping, BUTTONUNDEFINED, sizeof(CONTROL_JoyButtonMapping));
- memset(CONTROL_KeyMapping, KEYUNDEFINED, sizeof(CONTROL_KeyMapping));
- memset(CONTROL_MouseAxesMap, AXISUNDEFINED, sizeof(CONTROL_MouseAxesMap));
- memset(CONTROL_JoyAxesMap, AXISUNDEFINED, sizeof(CONTROL_JoyAxesMap));
- memset(CONTROL_MouseAxes, 0, sizeof(CONTROL_MouseAxes));
- memset(CONTROL_JoyAxes, 0, sizeof(CONTROL_JoyAxes));
- memset(CONTROL_LastMouseAxes, 0, sizeof(CONTROL_LastMouseAxes));
- memset(CONTROL_LastJoyAxes, 0, sizeof(CONTROL_LastJoyAxes));
- for (i=0;i<MAXMOUSEAXES;i++)
- CONTROL_MouseAxesScale[i] = NORMALAXISSCALE;
- for (i=0;i<MAXJOYAXES;i++)
- CONTROL_JoyAxesScale[i] = NORMALAXISSCALE;
+ memset(CONTROL_MouseButtonMapping, BUTTONUNDEFINED, sizeof(CONTROL_MouseButtonMapping));
+ memset(CONTROL_JoyButtonMapping, BUTTONUNDEFINED, sizeof(CONTROL_JoyButtonMapping));
+ memset(CONTROL_KeyMapping, KEYUNDEFINED, sizeof(CONTROL_KeyMapping));
+ memset(CONTROL_MouseAxesMap, AXISUNDEFINED, sizeof(CONTROL_MouseAxesMap));
+ memset(CONTROL_JoyAxesMap, AXISUNDEFINED, sizeof(CONTROL_JoyAxesMap));
+ memset(CONTROL_MouseAxes, 0, sizeof(CONTROL_MouseAxes));
+ memset(CONTROL_JoyAxes, 0, sizeof(CONTROL_JoyAxes));
+ memset(CONTROL_LastMouseAxes, 0, sizeof(CONTROL_LastMouseAxes));
+ memset(CONTROL_LastJoyAxes, 0, sizeof(CONTROL_LastJoyAxes));
+ for (i=0;i<MAXMOUSEAXES;i++)
+ CONTROL_MouseAxesScale[i] = NORMALAXISSCALE;
+ for (i=0;i<MAXJOYAXES;i++)
+ CONTROL_JoyAxesScale[i] = NORMALAXISSCALE;
}
static void DoGetDeviceButtons(
- int32 buttons, int32 tm,
- int32 NumButtons,
- int32 *DeviceButtonState,
- int32 *ButtonClickedTime,
- boolean *ButtonClickedState,
- boolean *ButtonClicked,
- byte *ButtonClickedCount
+ int32 buttons, int32 tm,
+ int32 NumButtons,
+ int32 *DeviceButtonState,
+ int32 *ButtonClickedTime,
+ boolean *ButtonClickedState,
+ boolean *ButtonClicked,
+ byte *ButtonClickedCount
) {
- int32 i, bs;
+ int32 i, bs;
- for (i=0;i<NumButtons;i++) {
- bs = (buttons >> i) & 1;
+ for (i=0;i<NumButtons;i++) {
+ bs = (buttons >> i) & 1;
- DeviceButtonState[i] = bs;
- ButtonClickedState[i] = false;
+ DeviceButtonState[i] = bs;
+ ButtonClickedState[i] = false;
- if (bs) {
- if (ButtonClicked[i] == false) {
- ButtonClicked[i] = true;
+ if (bs) {
+ if (ButtonClicked[i] == false) {
+ ButtonClicked[i] = true;
- if (ButtonClickedCount[i] == 0 || tm > ButtonClickedTime[i]) {
- ButtonClickedTime[i] = tm + CONTROL_DoubleClickSpeed;
- ButtonClickedCount[i] = 1;
- }
- else if (tm < ButtonClickedTime[i]) {
- ButtonClickedState[i] = true;
- ButtonClickedTime[i] = 0;
- ButtonClickedCount[i] = 2;
- }
- }
- else if (ButtonClickedCount[i] == 2) {
- ButtonClickedState[i] = true;
- }
- } else {
- if (ButtonClickedCount[i] == 2)
- ButtonClickedCount[i] = 0;
+ if (ButtonClickedCount[i] == 0 || tm > ButtonClickedTime[i]) {
+ ButtonClickedTime[i] = tm + CONTROL_DoubleClickSpeed;
+ ButtonClickedCount[i] = 1;
+ }
+ else if (tm < ButtonClickedTime[i]) {
+ ButtonClickedState[i] = true;
+ ButtonClickedTime[i] = 0;
+ ButtonClickedCount[i] = 2;
+ }
+ }
+ else if (ButtonClickedCount[i] == 2) {
+ ButtonClickedState[i] = true;
+ }
+ } else {
+ if (ButtonClickedCount[i] == 2)
+ ButtonClickedCount[i] = 0;
- ButtonClicked[i] = false;
- }
- }
+ ButtonClicked[i] = false;
+ }
+ }
}
void CONTROL_GetDeviceButtons(void)
{
- int32 t;
+ int32 t;
- t = GetTime();
+ t = GetTime();
- if (CONTROL_MouseEnabled) {
- DoGetDeviceButtons(
- MOUSE_GetButtons(), t,
- CONTROL_NumMouseButtons,
- CONTROL_MouseButtonState,
- CONTROL_MouseButtonClickedTime,
- CONTROL_MouseButtonClickedState,
- CONTROL_MouseButtonClicked,
- CONTROL_MouseButtonClickedCount
- );
- }
+ if (CONTROL_MouseEnabled) {
+ DoGetDeviceButtons(
+ MOUSE_GetButtons(), t,
+ CONTROL_NumMouseButtons,
+ CONTROL_MouseButtonState,
+ CONTROL_MouseButtonClickedTime,
+ CONTROL_MouseButtonClickedState,
+ CONTROL_MouseButtonClicked,
+ CONTROL_MouseButtonClickedCount
+ );
+ }
- if (CONTROL_JoystickEnabled) {
- int32 buttons = joyb;
- if (joynumhats > 0 && joyhat[0] != -1) {
- static int32 hatstate[] = { 1, 1|2, 2, 2|4, 4, 4|8, 8, 8|1 };
- int val;
+ if (CONTROL_JoystickEnabled) {
+ int32 buttons = joyb;
+ if (joynumhats > 0 && joyhat[0] != -1) {
+ static int32 hatstate[] = { 1, 1|2, 2, 2|4, 4, 4|8, 8, 8|1 };
+ int val;
- // thanks SDL for this much more sensible method
- val = ((joyhat[0] + 4500 / 2) % 36000) / 4500;
- if (val < 8) buttons |= hatstate[val] << min(MAXJOYBUTTONS,joynumbuttons);
- }
+ // thanks SDL for this much more sensible method
+ val = ((joyhat[0] + 4500 / 2) % 36000) / 4500;
+ if (val < 8) buttons |= hatstate[val] << min(MAXJOYBUTTONS,joynumbuttons);
+ }
- DoGetDeviceButtons(
- buttons, t,
- CONTROL_NumJoyButtons,
- CONTROL_JoyButtonState,
- CONTROL_JoyButtonClickedTime,
- CONTROL_JoyButtonClickedState,
- CONTROL_JoyButtonClicked,
- CONTROL_JoyButtonClickedCount
- );
- }
+ DoGetDeviceButtons(
+ buttons, t,
+ CONTROL_NumJoyButtons,
+ CONTROL_JoyButtonState,
+ CONTROL_JoyButtonClickedTime,
+ CONTROL_JoyButtonClickedState,
+ CONTROL_JoyButtonClicked,
+ CONTROL_JoyButtonClickedCount
+ );
+ }
}
void CONTROL_DigitizeAxis(int32 axis, controldevice device)
{
- controlaxistype *set, *lastset;
-
- switch (device) {
- case controldevice_mouse:
- set = CONTROL_MouseAxes;
- lastset = CONTROL_LastMouseAxes;
- break;
+ controlaxistype *set, *lastset;
- case controldevice_joystick:
- set = CONTROL_JoyAxes;
- lastset = CONTROL_LastJoyAxes;
- break;
+ switch (device) {
+ case controldevice_mouse:
+ set = CONTROL_MouseAxes;
+ lastset = CONTROL_LastMouseAxes;
+ break;
- default: return;
- }
-
- if (set[axis].analog > 0) {
- if (set[axis].analog > THRESHOLD) { // if very much in one direction,
- set[axis].digital = 1; // set affirmative
- } else {
- if (set[axis].analog > MINTHRESHOLD) { // if hanging in limbo,
- if (lastset[axis].digital == 1) // set if in same direction as last time
- set[axis].digital = 1;
- }
- }
- } else {
- if (set[axis].analog < -THRESHOLD) {
- set[axis].digital = -1;
- } else {
- if (set[axis].analog < -MINTHRESHOLD) {
- if (lastset[axis].digital == -1)
- set[axis].digital = -1;
- }
- }
- }
+ case controldevice_joystick:
+ set = CONTROL_JoyAxes;
+ lastset = CONTROL_LastJoyAxes;
+ break;
+
+ default: return;
+ }
+
+ if (set[axis].analog > 0) {
+ if (set[axis].analog > THRESHOLD) { // if very much in one direction,
+ set[axis].digital = 1; // set affirmative
+ } else {
+ if (set[axis].analog > MINTHRESHOLD) { // if hanging in limbo,
+ if (lastset[axis].digital == 1) // set if in same direction as last time
+ set[axis].digital = 1;
+ }
+ }
+ } else {
+ if (set[axis].analog < -THRESHOLD) {
+ set[axis].digital = -1;
+ } else {
+ if (set[axis].analog < -MINTHRESHOLD) {
+ if (lastset[axis].digital == -1)
+ set[axis].digital = -1;
+ }
+ }
+ }
}
void CONTROL_ScaleAxis(int32 axis, controldevice device)
{
- controlaxistype *set;
- int32 *scale;
-
- switch (device) {
- case controldevice_mouse:
- set = CONTROL_MouseAxes;
- scale = CONTROL_MouseAxesScale;
- break;
+ controlaxistype *set;
+ int32 *scale;
- case controldevice_joystick:
- set = CONTROL_JoyAxes;
- scale = CONTROL_JoyAxesScale;
- break;
+ switch (device) {
+ case controldevice_mouse:
+ set = CONTROL_MouseAxes;
+ scale = CONTROL_MouseAxesScale;
+ break;
- default: return;
- }
+ case controldevice_joystick:
+ set = CONTROL_JoyAxes;
+ scale = CONTROL_JoyAxesScale;
+ break;
- set[axis].analog = mulscale16(set[axis].analog, scale[axis]);
+ default: return;
+ }
+
+ set[axis].analog = mulscale16(set[axis].analog, scale[axis]);
}
void CONTROL_ApplyAxis(int32 axis, ControlInfo *info, controldevice device)
{
- controlaxistype *set;
- controlaxismaptype *map;
-
- switch (device) {
- case controldevice_mouse:
- set = CONTROL_MouseAxes;
- map = CONTROL_MouseAxesMap;
- break;
+ controlaxistype *set;
+ controlaxismaptype *map;
- case controldevice_joystick:
- set = CONTROL_JoyAxes;
- map = CONTROL_JoyAxesMap;
- break;
+ switch (device) {
+ case controldevice_mouse:
+ set = CONTROL_MouseAxes;
+ map = CONTROL_MouseAxesMap;
+ break;
- default: return;
- }
+ case controldevice_joystick:
+ set = CONTROL_JoyAxes;
+ map = CONTROL_JoyAxesMap;
+ break;
- switch (map[axis].analogmap) {
- case analog_turning: info->dyaw += set[axis].analog; break;
- case analog_strafing: info->dx += set[axis].analog; break;
- case analog_lookingupanddown: info->dpitch += set[axis].analog; break;
- case analog_elevation: info->dy += set[axis].analog; break;
- case analog_rolling: info->droll += set[axis].analog; break;
- case analog_moving: info->dz += set[axis].analog; break;
- default: break;
- }
+ default: return;
+ }
+
+ switch (map[axis].analogmap) {
+ case analog_turning: info->dyaw += set[axis].analog; break;
+ case analog_strafing: info->dx += set[axis].analog; break;
+ case analog_lookingupanddown: info->dpitch += set[axis].analog; break;
+ case analog_elevation: info->dy += set[axis].analog; break;
+ case analog_rolling: info->droll += set[axis].analog; break;
+ case analog_moving: info->dz += set[axis].analog; break;
+ default: break;
+ }
}
void CONTROL_PollDevices(ControlInfo *info)
{
- int32 i;
+ int32 i;
- memcpy(CONTROL_LastMouseAxes, CONTROL_MouseAxes, sizeof(CONTROL_MouseAxes));
- memcpy(CONTROL_LastJoyAxes, CONTROL_JoyAxes, sizeof(CONTROL_JoyAxes));
+ memcpy(CONTROL_LastMouseAxes, CONTROL_MouseAxes, sizeof(CONTROL_MouseAxes));
+ memcpy(CONTROL_LastJoyAxes, CONTROL_JoyAxes, sizeof(CONTROL_JoyAxes));
- memset(CONTROL_MouseAxes, 0, sizeof(CONTROL_MouseAxes));
- memset(CONTROL_JoyAxes, 0, sizeof(CONTROL_JoyAxes));
- memset(info, 0, sizeof(ControlInfo));
+ memset(CONTROL_MouseAxes, 0, sizeof(CONTROL_MouseAxes));
+ memset(CONTROL_JoyAxes, 0, sizeof(CONTROL_JoyAxes));
+ memset(info, 0, sizeof(ControlInfo));
- if (CONTROL_MouseEnabled) {
- CONTROL_GetMouseDelta();
+ if (CONTROL_MouseEnabled) {
+ CONTROL_GetMouseDelta();
- for (i=0; i<MAXMOUSEAXES; i++) {
- CONTROL_DigitizeAxis(i, controldevice_mouse);
- CONTROL_ScaleAxis(i, controldevice_mouse);
- LIMITCONTROL(&CONTROL_MouseAxes[i].analog);
- CONTROL_ApplyAxis(i, info, controldevice_mouse);
- }
- }
- if (CONTROL_JoystickEnabled) {
- CONTROL_GetJoyDelta();
+ for (i=0; i<MAXMOUSEAXES; i++) {
+ CONTROL_DigitizeAxis(i, controldevice_mouse);
+ CONTROL_ScaleAxis(i, controldevice_mouse);
+ LIMITCONTROL(&CONTROL_MouseAxes[i].analog);
+ CONTROL_ApplyAxis(i, info, controldevice_mouse);
+ }
+ }
+ if (CONTROL_JoystickEnabled) {
+ CONTROL_GetJoyDelta();
- // Why?
- //CONTROL_Axes[0].analog /= 2;
- //CONTROL_Axes[2].analog /= 2;
+ // Why?
+ //CONTROL_Axes[0].analog /= 2;
+ //CONTROL_Axes[2].analog /= 2;
- for (i=0; i<MAXJOYAXES; i++) {
- CONTROL_DigitizeAxis(i, controldevice_joystick);
- CONTROL_ScaleAxis(i, controldevice_joystick);
- LIMITCONTROL(&CONTROL_JoyAxes[i].analog);
- CONTROL_ApplyAxis(i, info, controldevice_joystick);
- }
- }
-
- CONTROL_GetDeviceButtons();
+ for (i=0; i<MAXJOYAXES; i++) {
+ CONTROL_DigitizeAxis(i, controldevice_joystick);
+ CONTROL_ScaleAxis(i, controldevice_joystick);
+ LIMITCONTROL(&CONTROL_JoyAxes[i].analog);
+ CONTROL_ApplyAxis(i, info, controldevice_joystick);
+ }
+ }
+
+ CONTROL_GetDeviceButtons();
}
void CONTROL_AxisFunctionState(int32 *p1)
{
- int32 i, j;
-
- for (i=0; i<CONTROL_NumMouseAxes; i++) {
- if (!CONTROL_MouseAxes[i].digital) continue;
+ int32 i, j;
- if (CONTROL_MouseAxes[i].digital < 0)
- j = CONTROL_MouseAxesMap[i].minmap;
- else
- j = CONTROL_MouseAxesMap[i].maxmap;
+ for (i=0; i<CONTROL_NumMouseAxes; i++) {
+ if (!CONTROL_MouseAxes[i].digital) continue;
- if (j != AXISUNDEFINED)
- p1[j] = 1;
- }
+ if (CONTROL_MouseAxes[i].digital < 0)
+ j = CONTROL_MouseAxesMap[i].minmap;
+ else
+ j = CONTROL_MouseAxesMap[i].maxmap;
- for (i=0; i<CONTROL_NumJoyAxes; i++) {
- if (!CONTROL_JoyAxes[i].digital) continue;
+ if (j != AXISUNDEFINED)
+ p1[j] = 1;
+ }
- if (CONTROL_JoyAxes[i].digital < 0)
- j = CONTROL_JoyAxesMap[i].minmap;
- else
- j = CONTROL_JoyAxesMap[i].maxmap;
+ for (i=0; i<CONTROL_NumJoyAxes; i++) {
+ if (!CONTROL_JoyAxes[i].digital) continue;
- if (j != AXISUNDEFINED)
- p1[j] = 1;
- }
+ if (CONTROL_JoyAxes[i].digital < 0)
+ j = CONTROL_JoyAxesMap[i].minmap;
+ else
+ j = CONTROL_JoyAxesMap[i].maxmap;
+
+ if (j != AXISUNDEFINED)
+ p1[j] = 1;
+ }
}
void CONTROL_ButtonFunctionState( int32 *p1 )
{
- int32 i, j;
+ int32 i, j;
- for (i=0; i<CONTROL_NumMouseButtons; i++) {
- j = CONTROL_MouseButtonMapping[i].doubleclicked;
- if (j != KEYUNDEFINED)
- p1[j] |= CONTROL_MouseButtonClickedState[i];
+ for (i=0; i<CONTROL_NumMouseButtons; i++) {
+ j = CONTROL_MouseButtonMapping[i].doubleclicked;
+ if (j != KEYUNDEFINED)
+ p1[j] |= CONTROL_MouseButtonClickedState[i];
- j = CONTROL_MouseButtonMapping[i].singleclicked;
- if (j != KEYUNDEFINED)
- p1[j] |= CONTROL_MouseButtonState[i];
- }
+ j = CONTROL_MouseButtonMapping[i].singleclicked;
+ if (j != KEYUNDEFINED)
+ p1[j] |= CONTROL_MouseButtonState[i];
+ }
- for (i=0; i<CONTROL_NumJoyButtons; i++) {
- j = CONTROL_JoyButtonMapping[i].doubleclicked;
- if (j != KEYUNDEFINED)
- p1[j] |= CONTROL_JoyButtonClickedState[i];
+ for (i=0; i<CONTROL_NumJoyButtons; i++) {
+ j = CONTROL_JoyButtonMapping[i].doubleclicked;
+ if (j != KEYUNDEFINED)
+ p1[j] |= CONTROL_JoyButtonClickedState[i];
- j = CONTROL_JoyButtonMapping[i].singleclicked;
- if (j != KEYUNDEFINED)
- p1[j] |= CONTROL_JoyButtonState[i];
- }
+ j = CONTROL_JoyButtonMapping[i].singleclicked;
+ if (j != KEYUNDEFINED)
+ p1[j] |= CONTROL_JoyButtonState[i];
+ }
}
/*
void CONTROL_GetUserInput( UserInput *info )
@@ -795,31 +795,31 @@ void CONTROL_ClearUserInput( UserInput *info )
*/
void CONTROL_ClearButton( int32 whichbutton )
{
- if (CONTROL_CheckRange( whichbutton )) return;
- BUTTONCLEAR( whichbutton );
- CONTROL_Flags[whichbutton].cleared = true;
+ if (CONTROL_CheckRange( whichbutton )) return;
+ BUTTONCLEAR( whichbutton );
+ CONTROL_Flags[whichbutton].cleared = true;
}
void CONTROL_GetInput( ControlInfo *info )
{
- int32 i, periphs[CONTROL_NUM_FLAGS];
+ int32 i, periphs[CONTROL_NUM_FLAGS];
- CONTROL_PollDevices( info );
+ CONTROL_PollDevices( info );
- memset(periphs, 0, sizeof(periphs));
- CONTROL_ButtonFunctionState(periphs);
- CONTROL_AxisFunctionState(periphs);
+ memset(periphs, 0, sizeof(periphs));
+ CONTROL_ButtonFunctionState(periphs);
+ CONTROL_AxisFunctionState(periphs);
- CONTROL_ButtonHeldState1 = CONTROL_ButtonState1;
- CONTROL_ButtonHeldState2 = CONTROL_ButtonState2;
- CONTROL_ButtonState1 = CONTROL_ButtonState2 = 0;
+ CONTROL_ButtonHeldState1 = CONTROL_ButtonState1;
+ CONTROL_ButtonHeldState2 = CONTROL_ButtonState2;
+ CONTROL_ButtonState1 = CONTROL_ButtonState2 = 0;
- for (i=0; i<CONTROL_NUM_FLAGS; i++) {
- CONTROL_SetFlag(i, CONTROL_KeyboardFunctionPressed(i) | periphs[i]);
+ for (i=0; i<CONTROL_NUM_FLAGS; i++) {
+ CONTROL_SetFlag(i, CONTROL_KeyboardFunctionPressed(i) | periphs[i]);
- if (CONTROL_Flags[i].cleared == false) BUTTONSET(i, CONTROL_Flags[i].active);
- else if (CONTROL_Flags[i].active == false) CONTROL_Flags[i].cleared = 0;
- }
+ if (CONTROL_Flags[i].cleared == false) BUTTONSET(i, CONTROL_Flags[i].active);
+ else if (CONTROL_Flags[i].active == false) CONTROL_Flags[i].cleared = 0;
+ }
}
void CONTROL_WaitRelease( void )
@@ -832,75 +832,75 @@ void CONTROL_Ack( void )
boolean CONTROL_Startup(controltype which, int32 ( *TimeFunction )( void ), int32 ticspersecond)
{
- int32 i;
-
- if (CONTROL_Started) return false;
+ int32 i;
- if (TimeFunction) GetTime = TimeFunction;
- else GetTime = CONTROL_GetTime;
+ if (CONTROL_Started) return false;
- ticrate = ticspersecond;
+ if (TimeFunction) GetTime = TimeFunction;
+ else GetTime = CONTROL_GetTime;
- CONTROL_DoubleClickSpeed = (ticspersecond*57)/100;
- if (CONTROL_DoubleClickSpeed <= 0)
- CONTROL_DoubleClickSpeed = 1;
+ ticrate = ticspersecond;
- if (initinput()) return true;
+ CONTROL_DoubleClickSpeed = (ticspersecond*57)/100;
+ if (CONTROL_DoubleClickSpeed <= 0)
+ CONTROL_DoubleClickSpeed = 1;
- CONTROL_MousePresent = CONTROL_MouseEnabled = false;
- CONTROL_JoyPresent = CONTROL_JoystickEnabled = false;
- CONTROL_NumMouseButtons = CONTROL_NumJoyButtons = 0;
- CONTROL_NumMouseAxes = CONTROL_NumJoyAxes = 0;
- KB_Startup();
-
- //switch (which) {
- // case controltype_keyboard:
- // break;
+ if (initinput()) return true;
- // case controltype_keyboardandmouse:
- CONTROL_NumMouseAxes = MAXMOUSEAXES;
- CONTROL_NumMouseButtons = MAXMOUSEBUTTONS;
- CONTROL_MousePresent = MOUSE_Init();
- CONTROL_MouseEnabled = CONTROL_MousePresent;
- // break;
-
- // case controltype_keyboardandjoystick:
- CONTROL_NumJoyAxes = min(MAXJOYAXES,joynumaxes);
- CONTROL_NumJoyButtons = min(MAXJOYBUTTONS,joynumbuttons + 4*(joynumhats>0));
- CONTROL_JoyPresent = ((inputdevices & 4) == 4);
- CONTROL_JoystickEnabled = CONTROL_JoyPresent;
- // break;
- //}
-
- if (CONTROL_MousePresent)
- initprintf("CONTROL_Startup: Mouse Present\n");
- if (CONTROL_JoyPresent)
- initprintf("CONTROL_Startup: Joystick Present\n");
+ CONTROL_MousePresent = CONTROL_MouseEnabled = false;
+ CONTROL_JoyPresent = CONTROL_JoystickEnabled = false;
+ CONTROL_NumMouseButtons = CONTROL_NumJoyButtons = 0;
+ CONTROL_NumMouseAxes = CONTROL_NumJoyAxes = 0;
+ KB_Startup();
- CONTROL_ButtonState1 = 0;
- CONTROL_ButtonState2 = 0;
- CONTROL_ButtonHeldState1 = 0;
- CONTROL_ButtonHeldState2 = 0;
+ //switch (which) {
+ // case controltype_keyboard:
+ // break;
- memset(CONTROL_UserInputCleared, 0, sizeof(CONTROL_UserInputCleared));
+ // case controltype_keyboardandmouse:
+ CONTROL_NumMouseAxes = MAXMOUSEAXES;
+ CONTROL_NumMouseButtons = MAXMOUSEBUTTONS;
+ CONTROL_MousePresent = MOUSE_Init();
+ CONTROL_MouseEnabled = CONTROL_MousePresent;
+ // break;
- for (i=0; i<CONTROL_NUM_FLAGS; i++)
- CONTROL_Flags[i].used = false;
+ // case controltype_keyboardandjoystick:
+ CONTROL_NumJoyAxes = min(MAXJOYAXES,joynumaxes);
+ CONTROL_NumJoyButtons = min(MAXJOYBUTTONS,joynumbuttons + 4*(joynumhats>0));
+ CONTROL_JoyPresent = CONTROL_StartJoy(0);;
+ CONTROL_JoystickEnabled = CONTROL_JoyPresent;
+ // break;
+ //}
- CONTROL_Started = true;
+ if (CONTROL_MousePresent)
+ initprintf("CONTROL_Startup: Mouse Present\n");
+ if (CONTROL_JoyPresent)
+ initprintf("CONTROL_Startup: Joystick Present\n");
- return false;
+ CONTROL_ButtonState1 = 0;
+ CONTROL_ButtonState2 = 0;
+ CONTROL_ButtonHeldState1 = 0;
+ CONTROL_ButtonHeldState2 = 0;
+
+ memset(CONTROL_UserInputCleared, 0, sizeof(CONTROL_UserInputCleared));
+
+ for (i=0; i<CONTROL_NUM_FLAGS; i++)
+ CONTROL_Flags[i].used = false;
+
+ CONTROL_Started = true;
+
+ return false;
}
void CONTROL_Shutdown(void)
{
- if (!CONTROL_Started) return;
+ if (!CONTROL_Started) return;
- CONTROL_JoyPresent = false;
+ CONTROL_JoyPresent = false;
- MOUSE_Shutdown();
- uninitinput();
+ MOUSE_Shutdown();
+ uninitinput();
- CONTROL_Started = false;
+ CONTROL_Started = false;
}