From 1a8f56fcad951aa15825f4f8ec2b39c41cb7a46e Mon Sep 17 00:00:00 2001 From: Edgar Simo Date: Thu, 31 Jul 2008 10:31:31 +0000 Subject: [PATCH] Fixed broken envelopes. --- src/haptic/darwin/SDL_syshaptic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c index c6852785f..161c1bf78 100644 --- a/src/haptic/darwin/SDL_syshaptic.c +++ b/src/haptic/darwin/SDL_syshaptic.c @@ -655,7 +655,7 @@ SDL_SYS_ToFFEFFECT( SDL_Haptic * haptic, FFEFFECT * dest, SDL_HapticEffect * src } /* Envelope */ - if ((envelope->dwAttackTime == 0) && (envelope->dwFadeTime == 0)) { + if ((hap_constant->attack_length==0) && (hap_constant->fade_length==0)) { SDL_free(envelope); dest->lpEnvelope = NULL; } @@ -701,7 +701,7 @@ SDL_SYS_ToFFEFFECT( SDL_Haptic * haptic, FFEFFECT * dest, SDL_HapticEffect * src } /* Envelope */ - if ((envelope->dwAttackTime == 0) && (envelope->dwFadeTime == 0)) { + if ((hap_periodic->attack_length==0) && (hap_periodic->fade_length==0)) { SDL_free(envelope); dest->lpEnvelope = NULL; } @@ -788,7 +788,7 @@ SDL_SYS_ToFFEFFECT( SDL_Haptic * haptic, FFEFFECT * dest, SDL_HapticEffect * src } /* Envelope */ - if ((envelope->dwAttackTime == 0) && (envelope->dwFadeTime == 0)) { + if ((hap_ramp->attack_length==0) && (hap_ramp->fade_length==0)) { SDL_free(envelope); dest->lpEnvelope = NULL; } @@ -833,7 +833,7 @@ SDL_SYS_ToFFEFFECT( SDL_Haptic * haptic, FFEFFECT * dest, SDL_HapticEffect * src } /* Envelope */ - if ((envelope->dwAttackTime == 0) && (envelope->dwFadeTime == 0)) { + if ((hap_custom->attack_length==0) && (hap_custom->fade_length==0)) { SDL_free(envelope); dest->lpEnvelope = NULL; }