# HG changeset patch # User Edgar Simo # Date 1217521141 0 # Node ID 6b29d9f267be85b91e353aa991ed3444b2420a39 # Parent 53bb7d21928d62cbbdd11d4ab9306b1ea1023f35 Another windows patch. diff -r 53bb7d21928d -r 6b29d9f267be src/haptic/win32/SDL_syshaptic.c --- a/src/haptic/win32/SDL_syshaptic.c Thu Jul 31 16:16:19 2008 +0000 +++ b/src/haptic/win32/SDL_syshaptic.c Thu Jul 31 16:19:01 2008 +0000 @@ -189,61 +189,17 @@ /* * Callback to get all supported effects. */ -/* #define EFFECT_TEST(e,s) \ if (pei->guid == (e)) \ haptic->supported |= (s) -*/ static BOOL CALLBACK -DI_EffectCallback(LPCDIEffectInfo pei, LPVOID pv) +DI_EffectCallback(LPCDIEFFECTINFO pei, LPVOID pv) { /* Prepare the haptic device. */ SDL_Haptic *haptic = (SDL_Haptic*) pv; haptic->supported = 0; /* Get supported. */ - switch (pei->guid) { - case GUID_Spring: - haptic->supported |= SDL_HAPTIC_SPRING; - break; - case GUID_Damper: - haptic->supported |= SDL_HAPTIC_DAMPER; - break; - case GUID_Inertia: - haptic->supported |= SDL_HAPTIC_INERTIA; - break; - case GUID_Friction: - haptic->supported |= SDL_HAPTIC_FRICTION; - break; - case GUID_ConstantForce: - haptic->supported |= SDL_HAPTIC_CONSTANT; - break; - case GUID_CustomForce: - haptic->supported |= SDL_HAPTIC_CUSTOM; - break; - case GUID_Sine: - haptic->supported |= SDL_HAPTIC_SINE; - break; - case GUID_Square: - haptic->supported |= SDL_HAPTIC_SQUARE; - break; - case GUID_Triangle: - haptic->supported |= SDL_HAPTIC_TRIANGLE; - break; - case GUID_SawtoothUp: - haptic->supported |= SDL_HAPTIC_SAWTOOTHUP; - break; - case GUID_SawtoothDown: - haptic->supported |= SDL_HAPTIC_SAWTOOTHDOWN; - break; - case GUID_RampForce: - haptic->supported |= SDL_HAPTIC_RAMP; - break; - - default: - break; - } -/* EFFECT_TEST(GUID_Spring, SDL_HAPTIC_SPRING); EFFECT_TEST(GUID_Damper, SDL_HAPTIC_DAMPER); EFFECT_TEST(GUID_Inertia, SDL_HAPTIC_INERTIA); @@ -256,7 +212,6 @@ EFFECT_TEST(GUID_SawtoothUp, SDL_HAPTIC_SAWTOOTHUP); EFFECT_TEST(GUID_SawtoothDown, SDL_HAPTIC_SAWTOOTHDOWN); EFFECT_TEST(GUID_RampForce, SDL_HAPTIC_RAMP); -*/ /* Check for more. */ return DIENUM_CONTINUE;