From ec8ccd3bf79f2f2e6d7c7637391e6064977af386 Mon Sep 17 00:00:00 2001 From: Edgar Simo Date: Wed, 6 Aug 2008 10:48:35 +0000 Subject: [PATCH] Removed TODO. Fixed condition envelope behaviour. --- src/haptic/darwin/SDL_syshaptic.c | 8 +------- src/haptic/win32/SDL_syshaptic.c | 10 +++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c index 9c50c53a1..eb9210acc 100644 --- a/src/haptic/darwin/SDL_syshaptic.c +++ b/src/haptic/darwin/SDL_syshaptic.c @@ -765,15 +765,9 @@ SDL_SYS_ToFFEFFECT( SDL_Haptic * haptic, FFEFFECT * dest, SDL_HapticEffect * src return -1; } - /* Envelope */ + /* Envelope - Not actually supported by most CONDITION implementations. */ SDL_free(dest->lpEnvelope); dest->lpEnvelope = NULL; -/* TODO Check is envelope actually used. - envelope->dwAttackLevel = CCONVERT(hap_condition->attack_level); - envelope->dwAttackTime = hap_condition->attack_length * 1000; - envelope->dwFadeLevel = CCONVERT(hap_condition->fade_level); - envelope->dwFadeTime = hap_condition->fade_length * 1000; -*/ break; diff --git a/src/haptic/win32/SDL_syshaptic.c b/src/haptic/win32/SDL_syshaptic.c index 6e336aa6c..bb26a4e54 100644 --- a/src/haptic/win32/SDL_syshaptic.c +++ b/src/haptic/win32/SDL_syshaptic.c @@ -882,13 +882,9 @@ SDL_SYS_ToDIEFFECT( SDL_Haptic * haptic, DIEFFECT * dest, SDL_HapticEffect * src return -1; } - /* Envelope */ -/* TODO Check is envelope actually used. - envelope->dwAttackLevel = CONVERT(hap_condition->attack_level); - envelope->dwAttackTime = hap_condition->attack_length * 1000; - envelope->dwFadeLevel = CONVERT(hap_condition->fade_level); - envelope->dwFadeTime = hap_condition->fade_length * 1000; -*/ + /* Envelope - Not actually supported by most CONDITION implementations. */ + SDL_free(dest->lpEnvelope); + dest->lpEnvelope = NULL; break;