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

Actually unpause 3D beam sounds correctly. #1445

Merged
merged 1 commit into from Aug 24, 2017

Conversation

Projects
None yet
2 participants
@MageKing17
Member

MageKing17 commented Aug 23, 2017

beam_pause_sounds() "pauses" looping beam sounds by setting their volume to 0; beam_unpause_sounds() "unpaused" by calling beam_recalc_sounds(), which only set the volume correctly when -no_3d_sound is set; 3D sound updates the sound's position without changing its volume. This PR just makes beam_unpause_sounds() perform the inverse operation of beam_pause_sounds() if 3D sounds are enabled.

Actually unpause 3D beam sounds correctly.
beam_pause_sounds() "pauses" looping beam sounds by setting their volume to 0; beam_unpause_sounds() "unpaused" by calling beam_recalc_sounds(), which only set the volume correctly when -no_3d_sound is set; 3D sound updates the sound's position without changing its volume. This PR just makes beam_unpause_sounds() perform the inverse operation of beam_pause_sounds() if 3D sounds are enabled.

@MageKing17 MageKing17 added the bugfix label Aug 23, 2017

@MageKing17 MageKing17 added this to the Release 3.8.2 milestone Aug 23, 2017

@asarium asarium merged commit e085cc2 into scp-fs2open:master Aug 24, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@MageKing17 MageKing17 deleted the MageKing17:bugfix/beam-sound-unpause branch Aug 24, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment