Skip to content
Permalink
Browse files

Fixed SDL_HapticNewEffect() failing on various DirectInput devices.

  • Loading branch information
icculus committed Mar 18, 2014
1 parent 2a2fb61 commit 18c9a4e96b5c95432fb2399c9c622dc7be2ac610
Showing with 18 additions and 1 deletion.
  1. +18 −1 src/haptic/windows/SDL_syshaptic.c
@@ -507,8 +507,25 @@ DI_DeviceObjectCallback(LPCDIDEVICEOBJECTINSTANCE dev, LPVOID pvRef)
SDL_Haptic *haptic = (SDL_Haptic *) pvRef;

if ((dev->dwType & DIDFT_AXIS) && (dev->dwFlags & DIDOI_FFACTUATOR)) {
const GUID *guid = &dev->guidType;
DWORD offset = 0;
if (DI_GUIDIsSame(guid, &GUID_XAxis)) {
offset = DIJOFS_X;
} else if (DI_GUIDIsSame(guid, &GUID_YAxis)) {
offset = DIJOFS_Y;
} else if (DI_GUIDIsSame(guid, &GUID_ZAxis)) {
offset = DIJOFS_Z;
} else if (DI_GUIDIsSame(guid, &GUID_RxAxis)) {
offset = DIJOFS_RX;
} else if (DI_GUIDIsSame(guid, &GUID_RyAxis)) {
offset = DIJOFS_RY;
} else if (DI_GUIDIsSame(guid, &GUID_RzAxis)) {
offset = DIJOFS_RZ;
} else {
return DIENUM_CONTINUE; /* can't use this, go on. */
}

haptic->hwdata->axes[haptic->naxes] = dev->dwOfs;
haptic->hwdata->axes[haptic->naxes] = offset;
haptic->naxes++;

/* Currently using the artificial limit of 3 axes. */

0 comments on commit 18c9a4e

Please sign in to comment.