Mercurial > sdl-ios-xcode

comparison src/haptic/win32/SDL_syshaptic.c @ 3013:8cc00819c8d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverted Bob's indent checkin
author Sam Lantinga <slouken@libsdl.org>
date Sat, 10 Jan 2009 21:50:26 +0000
parents 8f4ed5ec2b06
children
comparison
equal deleted inserted replaced
3012:7e30c2dc7783 3013:8cc00819c8d6
210 } 210 }
211 211
212 /* Get capabilities. */ 212 /* Get capabilities. */
213 SDL_hapticlist[SDL_numhaptics].capabilities.dwSize = sizeof(DIDEVCAPS); 213 SDL_hapticlist[SDL_numhaptics].capabilities.dwSize = sizeof(DIDEVCAPS);
214 ret = IDirectInputDevice_GetCapabilities(device, 214 ret = IDirectInputDevice_GetCapabilities(device,
215 &SDL_hapticlist 215 &SDL_hapticlist[SDL_numhaptics].
216 [SDL_numhaptics].capabilities); 216 capabilities);
217 if (FAILED(ret)) { 217 if (FAILED(ret)) {
218 /* DI_SetError("Getting device capabilities",ret); */ 218 /* DI_SetError("Getting device capabilities",ret); */
219 IDirectInputDevice_Release(device); 219 IDirectInputDevice_Release(device);
220 return DIENUM_CONTINUE; 220 return DIENUM_CONTINUE;
221 } 221 }
330 } 330 }
331 331
332 /* Now get the IDirectInputDevice2 interface, instead. */ 332 /* Now get the IDirectInputDevice2 interface, instead. */
333 ret = IDirectInputDevice_QueryInterface(device, 333 ret = IDirectInputDevice_QueryInterface(device,
334 &IID_IDirectInputDevice2, 334 &IID_IDirectInputDevice2,
335 (LPVOID *) & haptic-> 335 (LPVOID *) & haptic->hwdata->
336 hwdata->device); 336 device);
337 /* Done with the temporary one now. */ 337 /* Done with the temporary one now. */
338 IDirectInputDevice_Release(device); 338 IDirectInputDevice_Release(device);
339 if (FAILED(ret)) { 339 if (FAILED(ret)) {
340 DI_SetError("Querying DirectInput interface", ret); 340 DI_SetError("Querying DirectInput interface", ret);
341 goto creat_err; 341 goto creat_err;
498 */ 498 */
499 int 499 int
500 SDL_SYS_HapticOpen(SDL_Haptic * haptic) 500 SDL_SYS_HapticOpen(SDL_Haptic * haptic)
501 { 501 {
502 return SDL_SYS_HapticOpenFromInstance(haptic, 502 return SDL_SYS_HapticOpenFromInstance(haptic,
503 SDL_hapticlist[haptic-> 503 SDL_hapticlist[haptic->index].
504 index].instance); 504 instance);
505 } 505 }
506 506
507 507
508 /* 508 /*
509 * Opens a haptic device from first mouse it finds for usage. 509 * Opens a haptic device from first mouse it finds for usage.