Mercurial > sdl-ios-xcode
comparison src/haptic/win32/SDL_syshaptic.c @ 2714:1d1be6137875
Merged last minute fixes from force feedback branch (r4031, r4033, r4034)
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Mon, 25 Aug 2008 10:04:06 +0000 |
parents | 0906692aa6a4 |
children | 336b604ec15b |
comparison
equal
deleted
inserted
replaced
2713:0906692aa6a4 | 2714:1d1be6137875 |
---|---|
186 DI_SetError("Initializing DirectInput device", ret); | 186 DI_SetError("Initializing DirectInput device", ret); |
187 return -1; | 187 return -1; |
188 } | 188 } |
189 | 189 |
190 /* Look for haptic devices. */ | 190 /* Look for haptic devices. */ |
191 ret = IDirectInput_EnumDevices(dinput, 0, /* Not sure if this is legal, but gets all devices. */ | 191 ret = IDirectInput_EnumDevices(dinput, |
192 0, | |
192 EnumHapticsCallback, | 193 EnumHapticsCallback, |
193 NULL, | 194 NULL, |
194 DIEDFL_FORCEFEEDBACK | | 195 DIEDFL_FORCEFEEDBACK | |
195 DIEDFL_ATTACHEDONLY); | 196 DIEDFL_ATTACHEDONLY); |
196 if (FAILED(ret)) { | 197 if (FAILED(ret)) { |