Untested fix for bug 946 (SDL_HapticIndex returns 0 for all devices)
Edgar Simo 2011-02-20 09:02:31 PST Linux uses fname, which is the name of the device path like for example /dev/input/event3 so it shouldn't have the issue. However I can confirm that it looks like haptic->index never gets properly set on windows. Have to look at mac os x also. I'll see if I can fix it real quick now.
This commit is contained in:
parent
dc7c1fa1df
commit
d5af47a5c7
2 changed files with 32 additions and 1 deletions
|
@ -576,7 +576,26 @@ SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
|
|||
int
|
||||
SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
|
||||
{
|
||||
int ret;
|
||||
int i, ret;
|
||||
HRESULT idret;
|
||||
DIDEVICEINSTANCE joy_instance;
|
||||
|
||||
/* Since it comes from a joystick we have to try to match it with a haptic device on our haptic list. */
|
||||
for (i=0; i<SDL_numhaptics; i++) {
|
||||
idret = IDirectInputDevice2_GetDeviceInfo(joystick->hwdata->InputDevice,
|
||||
&joy_instance);
|
||||
if (FAILED(idret)) {
|
||||
return -1;
|
||||
}
|
||||
if (DI_GUIDIsSame(&SDL_hapticlist[i].instance.guidInstance,
|
||||
&joy_instance.guidInstance)) {
|
||||
haptic->index = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i >= SDL_numhaptics) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Allocate the hwdata */
|
||||
haptic->hwdata = (struct haptic_hwdata *)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue