Removed TODO. gsoc2008_force_feedback
authorEdgar Simo <bobbens@gmail.com>
Wed, 06 Aug 2008 10:48:35 +0000
branchgsoc2008_force_feedback
changeset 262943a0416b3707
parent 2628 bfbda6c656e5
child 2630 776f7f800131
Removed TODO.
Fixed condition envelope behaviour.
src/haptic/darwin/SDL_syshaptic.c
src/haptic/win32/SDL_syshaptic.c
     1.1 --- a/src/haptic/darwin/SDL_syshaptic.c	Wed Aug 06 10:33:16 2008 +0000
     1.2 +++ b/src/haptic/darwin/SDL_syshaptic.c	Wed Aug 06 10:48:35 2008 +0000
     1.3 @@ -765,15 +765,9 @@
     1.4              return -1;                
     1.5           }                            
     1.6                                        
     1.7 -         /* Envelope */
     1.8 +         /* Envelope - Not actually supported by most CONDITION implementations. */
     1.9           SDL_free(dest->lpEnvelope);
    1.10           dest->lpEnvelope = NULL;
    1.11 -/* TODO Check is envelope actually used.
    1.12 -         envelope->dwAttackLevel = CCONVERT(hap_condition->attack_level);
    1.13 -         envelope->dwAttackTime = hap_condition->attack_length * 1000;
    1.14 -         envelope->dwFadeLevel = CCONVERT(hap_condition->fade_level);
    1.15 -         envelope->dwFadeTime = hap_condition->fade_length * 1000;
    1.16 -*/
    1.17  
    1.18           break;
    1.19  
     2.1 --- a/src/haptic/win32/SDL_syshaptic.c	Wed Aug 06 10:33:16 2008 +0000
     2.2 +++ b/src/haptic/win32/SDL_syshaptic.c	Wed Aug 06 10:48:35 2008 +0000
     2.3 @@ -882,13 +882,9 @@
     2.4              return -1;                
     2.5           }                            
     2.6                                        
     2.7 -         /* Envelope */
     2.8 -/* TODO Check is envelope actually used.
     2.9 -         envelope->dwAttackLevel = CONVERT(hap_condition->attack_level);
    2.10 -         envelope->dwAttackTime = hap_condition->attack_length * 1000;
    2.11 -         envelope->dwFadeLevel = CONVERT(hap_condition->fade_level);
    2.12 -         envelope->dwFadeTime = hap_condition->fade_length * 1000;
    2.13 -*/
    2.14 +         /* Envelope - Not actually supported by most CONDITION implementations. */
    2.15 +         SDL_free(dest->lpEnvelope);
    2.16 +         dest->lpEnvelope = NULL;
    2.17  
    2.18           break;
    2.19