Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

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.
  • Loading branch information
slouken committed Feb 20, 2011
1 parent 3f761fc commit 96cfb6afcbcbb2e0622513b5a2d221b8d397cb59
Showing with 32 additions and 1 deletion.
  1. +12 −0 src/haptic/darwin/SDL_syshaptic.c
  2. +20 −1 src/haptic/windows/SDL_syshaptic.c
@@ -534,6 +534,18 @@ SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
int
SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
{
int i;
for (i=0; i<SDL_numhaptics; i++) {
if (IOObjectIsEqualTo((io_object_t) SDL_hapticlist[i].dev,
joystick->hwdata->ffservice)) {
haptic->index = i;
break;
}
}
if (i >= SDL_numhaptics) {
return -1;
}

return SDL_SYS_HapticOpenFromService(haptic, joystick->hwdata->ffservice);
}

@@ -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 *)

0 comments on commit 96cfb6a

Please sign in to comment.