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

SAGA: Fix ITE digial music looping regression #3513

Merged
merged 1 commit into from Nov 10, 2021

Conversation

@eriktorbjorn
Copy link
Member

@eriktorbjorn eriktorbjorn commented Nov 10, 2021

This attempts to fix the music looping regression described in https://forums.scummvm.org/viewtopic.php?t=16434

See commit message for details about where the regression came from.

I was tempted to commit it right away, but I'd appreciate if someone much more familiar with Inherit the Earth could comment on it first. After that, it's probably a good candidate for the 2.5 branch as well.

When the MUSIC_DEFAULT flag was removed, the logic for looping music was
accidentally inverted: Instead of everything except tracks 13 and 19
defaulting to looping, now only tracks 13 and 19 would default to
looping.

See b14a259 (SAGA: Get rid of the MUSIC_DEFAULT flag, 2014-07-20)
@bluegr
Copy link
Member

@bluegr bluegr commented Nov 10, 2021

Since I did the relevant change back then, I can confirm that the problem in the original commit (b14a259) was a mistake from my part. Thanks for doing the R&D work on this and fixing the music loop behavior!

Merging

Loading

@bluegr bluegr merged commit 216ad40 into scummvm:master Nov 10, 2021
5 of 8 checks passed
Loading
@eriktorbjorn
Copy link
Member Author

@eriktorbjorn eriktorbjorn commented Nov 10, 2021

And thank you for confirming that it was the correct fix. I'll merge it to the 2.5 branch and add a NEWS item for it.

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants