Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lower Afterburner force feedback effect strength to previous levels #1429

Merged
merged 1 commit into from Aug 8, 2017

Conversation

@asarium
Copy link
Member

commented Aug 2, 2017

This was suggested by taylor on the forums and should match the previous
values more closely.

@asarium asarium added the bugfix label Aug 2, 2017

@asarium asarium added this to the Release 3.8 milestone Aug 2, 2017

@The-E
The-E approved these changes Aug 2, 2017
@@ -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;

This comment has been minimized.

Copy link
@MageKing17

MageKing17 Aug 2, 2017

Member

Uh... why are the length and magnitude being set again at all?

This comment has been minimized.

Copy link
@asarium

asarium Aug 2, 2017

Author Member

The effect is reused for the fly-by effect which uses a different magnitude so whenever the actual afterburner effect should be played the magnitude needs to be reset in case the fly-by effect was played before.

This comment has been minimized.

Copy link
@MageKing17

MageKing17 Aug 2, 2017

Member

Is there some reason the effects can't be separated?

This comment has been minimized.

Copy link
@asarium

asarium Aug 2, 2017

Author Member

It was probably done to reduce the amount of used effects. In any case, I'm not going to poke around in code that I can test and it would be out of scope for this PR anyway.

This comment has been minimized.

Copy link
@MageKing17

MageKing17 Aug 2, 2017

Member

Then my next question is why pAfterburn2 is defined with a finite duration and then duration is set to SDL_HAPTIC_INFINITY here.

This comment has been minimized.

Copy link
@asarium

asarium Aug 2, 2017

Author Member

The original code uses INFINITE for both effects while initializing so it was probably a mistake made while porting the code.

@MageKing17

This comment has been minimized.

Copy link
Member

commented Aug 3, 2017

taylor pointed out another effect with the wrong magnitude: http://www.hard-light.net/forums/index.php?topic=93734.msg1852296#msg1852296

May as well fix it in the same PR.

Lower Afterburner force feedback effect strength to previous levels
This was suggested by taylor on the forums and should match the previous
values more closely.

@asarium asarium force-pushed the asarium:fix/ffEffectStrength branch from f7f4d56 to 783852a Aug 3, 2017

@asarium

This comment has been minimized.

Copy link
Member Author

commented Aug 8, 2017

Lykurgos88 confirmed on the forums that these changes fixed the effect strengths so this should be ready to be merged now.

@The-E The-E merged commit fb4169b into scp-fs2open:master Aug 8, 2017

4 checks passed

continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.