[Scummvm-git-logs] scummvm branch-2-5 -> 6e7616367872e555908da77e890664d8a14529b8

[eriktorbjorn]

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

Summary:
30ac9116bb SAGA: Fix ITE digial music looping regression
6e76163678 NEWS: Add note about Inherit the Earth looping music


Commit: 30ac9116bb119d3c9b7fef73586710c0096a6e12
    https://github.com/scummvm/scummvm/commit/30ac9116bb119d3c9b7fef73586710c0096a6e12
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-11-10T20:42:32+01: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) {


Commit: 6e7616367872e555908da77e890664d8a14529b8
    https://github.com/scummvm/scummvm/commit/6e7616367872e555908da77e890664d8a14529b8
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-11-10T20:43:36+01:00

Commit Message:
NEWS: Add note about Inherit the Earth looping music

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index bd8534b9a7..d2b61ed9b1 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -21,6 +21,9 @@ For a more comprehensive changelog of the latest experimental code, see:
  Kyra:
    - Fixed graphical glitch in Legend of Kyrandia 3.
 
+ SAGA:
+   - Fixed digitized music not looping in Inherit the Earth.
+
  SCUMM:
    - Improved support for the high-resolution text in the 16-color Macintosh
      versions of Loom and Indiana Jones and the Last Crusade.