Mercurial > sdl-ios-xcode

changeset 2629:43a0416b3707 gsoc2008_force_feedback

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed TODO. Fixed condition envelope behaviour.
author Edgar Simo <bobbens@gmail.com>
date Wed, 06 Aug 2008 10:48:35 +0000
parents bfbda6c656e5
children 776f7f800131
files src/haptic/darwin/SDL_syshaptic.c src/haptic/win32/SDL_syshaptic.c
diffstat 2 files changed, 4 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- 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;
 
--- 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;