Mercurial > sdl-ios-xcode

comparison src/haptic/win32/SDL_syshaptic.c @ 2611:cdea9a70dade gsoc2008_force_feedback

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enabled capabilities again.
author Edgar Simo <bobbens@gmail.com>
date Wed, 06 Aug 2008 07:42:42 +0000
parents eec0c81ede06
children 63ea27a96a96
comparison
equal deleted inserted replaced
2610:71a835ee438a 2611:cdea9a70dade
65 */ 65 */
66 struct haptic_hwdata 66 struct haptic_hwdata
67 { 67 {
68 LPDIRECTINPUTDEVICE2 device; 68 LPDIRECTINPUTDEVICE2 device;
69 DWORD axes[3]; 69 DWORD axes[3];
70 /* DIDEVCAPS capabilities; */ 70 DIDEVCAPS capabilities;
71 }; 71 };
72 72
73 73
74 /* 74 /*
75 * Haptic system effect data. 75 * Haptic system effect data.
311 if (FAILED(ret)) { 311 if (FAILED(ret)) {
312 DI_SetError("Setting data format",ret); 312 DI_SetError("Setting data format",ret);
313 goto query_err; 313 goto query_err;
314 } 314 }
315 315
316 #if 0
317 /* Get capabilities. */ 316 /* Get capabilities. */
317 haptic->hwdata->capabilities.dwSize = sizeof(DIDEVCAPS);
318 ret = IDirectInputDevice2_GetCapabilities( haptic->hwdata->device, 318 ret = IDirectInputDevice2_GetCapabilities( haptic->hwdata->device,
319 &haptic->hwdata->capabilities ); 319 &haptic->hwdata->capabilities );
320 if (FAILED(ret)) { 320 if (FAILED(ret)) {
321 DI_SetError("Getting device capabilities",ret); 321 DI_SetError("Getting device capabilities",ret);
322 goto acquire_err; 322 goto acquire_err;
323 } 323 }
324 #endif
325 324
326 /* Get number of axes. */ 325 /* Get number of axes. */
327 ret = IDirectInputDevice2_EnumObjects( haptic->hwdata->device, 326 ret = IDirectInputDevice2_EnumObjects( haptic->hwdata->device,
328 DI_DeviceObjectCallback, 327 DI_DeviceObjectCallback,
329 haptic, DIDFT_AXIS ); 328 haptic, DIDFT_AXIS );