# HG changeset patch
# User Edgar Simo <bobbens@gmail.com>
# Date 1218019715 0
# Node ID 43a0416b37075bd653059f7ee770107bcca1c5a8
# Parent  bfbda6c656e537909d9a6fcecd50053eac605c1a
Removed TODO.
Fixed condition envelope behaviour.

diff -r bfbda6c656e5 -r 43a0416b3707 src/haptic/darwin/SDL_syshaptic.c
--- a/src/haptic/darwin/SDL_syshaptic.c	Wed Aug 06 10:33:16 2008 +0000
+++ b/src/haptic/darwin/SDL_syshaptic.c	Wed Aug 06 10:48:35 2008 +0000
@@ -765,15 +765,9 @@
             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 -r bfbda6c656e5 -r 43a0416b3707 src/haptic/win32/SDL_syshaptic.c
--- a/src/haptic/win32/SDL_syshaptic.c	Wed Aug 06 10:33:16 2008 +0000
+++ b/src/haptic/win32/SDL_syshaptic.c	Wed Aug 06 10:48:35 2008 +0000
@@ -882,13 +882,9 @@
             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;