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

SCUMM: MI2: Kill hanging tunes on start of next, Fixes bug #1410 #918

Merged
merged 2 commits into from Jul 30, 2017

Conversation

Projects
None yet
4 participants
@BenCastricum
Copy link
Contributor

commented Mar 8, 2017

Fix the "MI2: Two soundtracks playing at once" bug from the forum, as
well as the one the bug reporter experienced.

Both are caused by starting tunes as trigger from other tunes. This code suppresses the start or kills the hanging tune on start of the next. I left in some debug statements to see when the code kicks in so we can determine if there are any unexpected side effects. In the final version those probably should be removed.

@BenCastricum BenCastricum force-pushed the BenCastricum:bugfixes branch 2 times, most recently from 5741400 to 95ea0a3 Mar 8, 2017

@BenCastricum BenCastricum changed the title SCUMM: Fix for bug #1410 (Do not merge yet) SCUMM: MI2 kill certain tunes on start of next, Fixes bug #1410 Mar 14, 2017

@BenCastricum

This comment has been minimized.

Copy link
Contributor Author

commented Mar 14, 2017

The debugging code has been removed. I think it's merge-able now.

@BenCastricum BenCastricum force-pushed the BenCastricum:bugfixes branch from 95ea0a3 to 2e9a490 Mar 14, 2017

if (_game_id == GID_MONKEY2 && (sound == 107) && (getSoundStatus_internal(100, true) == 1))
return false;

/* In some cases 107 is running and doesn't get killed at Dread's map */

This comment has been minimized.

Copy link
@bluegr

bluegr Mar 14, 2017

Member

Why do you change comments to use /* .. */ here, when you're using // in the rest of your changes?

This comment has been minimized.

Copy link
@BenCastricum

BenCastricum Mar 15, 2017

Author Contributor

Just an old habbit from other projects. I fixed it. Thanks for pointing it out.

@BenCastricum BenCastricum force-pushed the BenCastricum:bugfixes branch from 2e9a490 to a90f18a Mar 15, 2017

@BenCastricum BenCastricum changed the title SCUMM: MI2 kill certain tunes on start of next, Fixes bug #1410 SCUMM: MI2: Kill hanging tunes on start of next, Fixes bug #1410 May 5, 2017

@BenCastricum BenCastricum force-pushed the BenCastricum:bugfixes branch from a90f18a to c35084c Jun 16, 2017

@BenCastricum BenCastricum force-pushed the BenCastricum:bugfixes branch from c35084c to 148e0c4 Jun 27, 2017

SCUMM: MI2 kill tune 107 on start of next, Fixes bug #1410 / Scabb Is…
…land

Fix the "MI2: Two soundtracks playing at once" bug from the forum.  It's
triggered when the player is moving faster then the scripts expect causing
the "stop tune 117" command be executed before the start of the tune.
Effectily creating a hanging tune 107.
This patch kills the tune when this sitation is detected.

@BenCastricum BenCastricum force-pushed the BenCastricum:bugfixes branch from 148e0c4 to c0fa212 Jul 18, 2017

SCUMM: MI2 kill tune 113 on start of next, Fixes bug #1410 / Booty Is…
…land

Fix the "MI2: Two soundtracks playing at once" bug from the bug tracker.
It's triggered when the player enters the kiosk for the second time and
leaves before tune 113 is started.

@BenCastricum BenCastricum force-pushed the BenCastricum:bugfixes branch from 1c3b01e to f8ee2df Jul 24, 2017

@digitall

This comment has been minimized.

Copy link
Member

commented Jul 30, 2017

@sev- : This seems fairly reasonable and self-contained. Any objections to just merging this?

@sev-

This comment has been minimized.

Copy link
Member

commented Jul 30, 2017

Right, merging

@sev- sev- merged commit d58f594 into scummvm:master Jul 30, 2017

1 check passed

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