Merge pull request #1429 from asarium/fix/ffEffectStrength

Lower Afterburner force feedback effect strength to previous levels

Author: The-E

code/io/joy_ff-sdl.cpp

@@ -326,7 +326,7 @@ static int joy_ff_create_effects()
 	pAfterburn1.eff.periodic.direction.dir[0] = 0;
 	pAfterburn1.eff.periodic.length = SDL_HAPTIC_INFINITY;
 	pAfterburn1.eff.periodic.period = 20;
-	pAfterburn1.eff.periodic.magnitude = 0x6665;
+	pAfterburn1.eff.periodic.magnitude = 0x3332;
 
 	pAfterburn1.id = SDL_HapticNewEffect(haptic, &pAfterburn1.eff);
 
@@ -344,7 +344,7 @@ static int joy_ff_create_effects()
 	pAfterburn2.eff.periodic.direction.dir[0] = 9000;
 	pAfterburn2.eff.periodic.length = 125;
 	pAfterburn2.eff.periodic.period = 100;
-	pAfterburn2.eff.periodic.magnitude = 0x3332;
+	pAfterburn2.eff.periodic.magnitude = 0x1999;
 
 	pAfterburn2.id = SDL_HapticNewEffect(haptic, &pAfterburn2.eff);
 
@@ -674,7 +674,7 @@ void joy_ff_docked()
 
 	SDL_HapticStopEffect(haptic, pDock.id);
 
-	pDock.eff.periodic.magnitude = 0x7fff;
+	pDock.eff.periodic.magnitude = 0x3332;
 
 	if ( SDL_HapticUpdateEffect(haptic, pDock.id, &pDock.eff) < 0 ) {
 		mprintf(("HapticERROR:  Unable to update pDock:\n  %s\n", SDL_GetError()));
@@ -695,7 +695,7 @@ void joy_ff_play_reload_effect()
 
 	SDL_HapticStopEffect(haptic, pDock.id);
 
-	pDock.eff.periodic.magnitude = 0x3fff;
+	pDock.eff.periodic.magnitude = 0x1999;
 
 	if ( SDL_HapticUpdateEffect(haptic, pDock.id, &pDock.eff) < 0 ) {
 		mprintf(("HapticERROR:  Unable to update pDock:\n  %s\n", SDL_GetError()));
@@ -716,7 +716,7 @@ void joy_ff_afterburn_on()
 		SDL_HapticStopEffect(haptic, pAfterburn1.id);
 
 		pAfterburn1.eff.periodic.length = SDL_HAPTIC_INFINITY;
-		pAfterburn1.eff.periodic.magnitude = 0x3fff;
+		pAfterburn1.eff.periodic.magnitude = 0x3332;
 
 		if ( SDL_HapticUpdateEffect(haptic, pAfterburn1.id, &pAfterburn1.eff) < 0 ) {
 			mprintf(("HapticERROR:  Unable to update pAfterburn1:\n  %s\n", SDL_GetError()));
@@ -727,7 +727,7 @@ void joy_ff_afterburn_on()
 		SDL_HapticStopEffect(haptic, pAfterburn2.id);
 
 		pAfterburn2.eff.periodic.length = SDL_HAPTIC_INFINITY;
-		pAfterburn2.eff.periodic.magnitude = 0x3fff;
+		pAfterburn2.eff.periodic.magnitude = 0x1999;
 
 		if ( SDL_HapticUpdateEffect(haptic, pAfterburn2.id, &pAfterburn2.eff) < 0 ) {
 			mprintf(("HapticERROR:  Unable to update pAfterburn2:\n  %s\n", SDL_GetError()));