[Scummvm-git-logs] scummvm master -> 216ad407464cd385f017b50b6146993b6a565196

bluegr bluegr at gmail.com
Wed Nov 10 19:30:27 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
216ad40746 SAGA: Fix ITE digial music looping regression


Commit: 216ad407464cd385f017b50b6146993b6a565196
    https://github.com/scummvm/scummvm/commit/216ad407464cd385f017b50b6146993b6a565196
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-11-10T21:30:24+02:00

Commit Message:
SAGA: Fix ITE digial music looping regression

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 b14a2599bc (SAGA: Get rid of the MUSIC_DEFAULT flag, 2014-07-20)

Changed paths:
    engines/saga/music.cpp


diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 5c9bee7429..e38dce62bb 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -349,7 +349,7 @@ bool Music::playDigital(uint32 resourceId, MusicFlags flags) {
 	int realTrackNumber = 0;
 
 	if (_vm->getGameId() == GID_ITE) {
-		if (flags == MUSIC_NORMAL && (resourceId == 13 || resourceId == 19))
+		if (resourceId != 13 && resourceId != 19)
 			flags = MUSIC_LOOP;
 		realTrackNumber = resourceId - 8;
 	} else if (_vm->getGameId() == GID_IHNM) {




More information about the Scummvm-git-logs mailing list