encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-09 05:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix device counting in HapticMouse and JoystickOpen routines. 0 is the first item in the list not the last

Browse Source
This commit is contained in:
Edward Rudd
2014-02-06 09:35:44 -05:00
parent f3e6a0a71b
commit a09548eb00
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/haptic/darwin/SDL_syshaptic.c
View File

@@ -199,7 +199,7 @@ HapticByDevIndex(int device_index)
while (device_index > 0) {
SDL_assert(item != NULL);
device_index--;
--device_index;
item = item->next;
}
@@ -571,7 +571,7 @@ SDL_SYS_HapticOpen(SDL_Haptic * haptic)
int
SDL_SYS_HapticMouse(void)
{
int device_index = numhaptics-1;
int device_index = 0;
SDL_hapticlist_item *item;
for (item = SDL_hapticlist; item; item = item->next) {
@@ -579,7 +579,7 @@ SDL_SYS_HapticMouse(void)
(item->usage == kHIDUsage_GD_Mouse)) {
return device_index;
}
device_index--;
++device_index;
}
return -1;

2
src/haptic/linux/SDL_syshaptic.c
View File

@@ -202,7 +202,7 @@ HapticByDevIndex(int device_index)
while (device_index > 0) {
SDL_assert(item != NULL);
device_index--;
--device_index;
item = item->next;
}

12
src/haptic/windows/SDL_syshaptic.c
View File

@@ -442,7 +442,7 @@ HapticByDevIndex(int device_index)
while (device_index > 0) {
SDL_assert(item != NULL);
device_index--;
--device_index;
item = item->next;
}
@@ -784,7 +784,7 @@ int
SDL_SYS_HapticMouse(void)
{
SDL_hapticlist_item *item;
int index = numhaptics-1;
int index = 0;
/* Grab the first mouse haptic device we find. */
for (item = SDL_hapticlist; item != NULL; item = item->next) {
@@ -792,7 +792,7 @@ SDL_SYS_HapticMouse(void)
if (item->capabilities.dwDevType == DI8DEVCLASS_POINTER ) {
return index;
}
index--;
++index;
}
return -1;
@@ -855,7 +855,7 @@ int
SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
{
SDL_hapticlist_item *item;
int index = numhaptics-1;
int index = 0;
/* Since it comes from a joystick we have to try to match it with a haptic device on our haptic list. */
if (joystick->hwdata->bXInputDevice) {
@@ -866,7 +866,7 @@ SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
haptic->index = index;
return SDL_SYS_HapticOpenFromXInput(haptic, userid);
}
index--;
++index;
}
} else {
HRESULT idret;
@@ -883,7 +883,7 @@ SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
haptic->index = index;
return SDL_SYS_HapticOpenFromDevice8(haptic, joystick->hwdata->InputDevice, SDL_TRUE);
}
index--;
++index;
}
}