Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-07-29 14:43:21 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged r2992:2993 from branches/SDL-1.2: Mac OS X multi-axis joystick support.

Browse Source
This commit is contained in:
Ryan C. Gordon 2007-03-18 22:39:24 +00:00
parent 435e813700
commit 62073d041d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/joystick/darwin/SDL_sysjoystick.c
View File

@ -690,9 +690,10 @@ SDL_SYS_JoystickInit(void)
*/
/* Filter device list to non-keyboard/mouse stuff */
if ((device->usagePage != kHIDPage_GenericDesktop) ||
((device->usage != kHIDUsage_GD_Joystick &&
device->usage != kHIDUsage_GD_GamePad))) {
if ( (device->usagePage != kHIDPage_GenericDesktop) ||
((device->usage != kHIDUsage_GD_Joystick &&
device->usage != kHIDUsage_GD_GamePad &&
device->usage != kHIDUsage_GD_MultiAxisController)) ) {
/* release memory for the device */
HIDDisposeDevice(&device);