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

Airplane SFX only play if not muted #2371

Merged
merged 1 commit into from
May 16, 2015
Merged

Conversation

niamu
Copy link
Member

@niamu niamu commented May 16, 2015

Don't use the old airplane.lua code anywhere in the game.

When changing audio settings within the greendale-exterior level from anything greater than 0 to mute, the airplane still makes noise but only at the point where it was when you made the change to 0.

The update code mistakenly checked to see if the SFX volume was 0 as to whether or not to move the audio location with the airplane. I moved this mute check to the enter function where we conditionally set whether we will have engine noise or not based on volume settings.

Resolves #2368.

@edisonout
Copy link
Member

LGTM

@CalebJohn
Copy link
Member

Thats my fault from the change to new collisions I forgot to remove the old stuff, LGTM

CalebJohn added a commit that referenced this pull request May 16, 2015
Airplane SFX only play if not muted
@CalebJohn CalebJohn merged commit 9de5561 into hawkthorne:master May 16, 2015
@niamu niamu deleted the airplane_sfx branch May 21, 2015 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Aeroplane makes noise even with sound off
3 participants