[Scummvm-git-logs] scummvm branch-2-5 -> bcd7823cffa3e6b5a19ca9f1ec59ce232d0c505e

[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:
e7c345fa11 SCUMM: DiMUSE: Backport fix for looping Dig music (bug #13058)
bcd7823cff NEWS: Mention looping music fix in The Dig


Commit: e7c345fa1157878d4577116fc7b206ced14c832f
    https://github.com/scummvm/scummvm/commit/e7c345fa1157878d4577116fc7b206ced14c832f
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-11-07T14:07:24+01:00

Commit Message:
SCUMM: DiMUSE: Backport fix for looping Dig music (bug #13058)

This is taken from pull request #3368 ("New Digital iMUSE Engine").
AndywinXp asked me to do it for him because it was less inconvenient for
me. It is only being applied to the 2.5 branch since his pull request
should take care of everything on the master branch later.

Changed paths:
    engines/scumm/imuse_digi/dimuse.cpp


diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index 8c8213254c..789ccbecdf 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -558,9 +558,8 @@ void IMuseDigital::switchToNextRegion(Track *track) {
 						debug(5, "SwToNeReg(trackId:%d) - sound(%d) faded track, select region %d, curHookId: %d", fadeTrack->trackId, fadeTrack->soundId, fadeTrack->curRegion, fadeTrack->curHookId);
 						fadeTrack->curHookId = 0;
 					}
-				} else {
-					track->curRegion = region;
 				}
+				track->curRegion = region;
 			}
 
 			debug(5, "SwToNeReg(trackId:%d) - sound(%d) jump to region %d, curHookId: %d", track->trackId, track->soundId, track->curRegion, track->curHookId);


Commit: bcd7823cffa3e6b5a19ca9f1ec59ce232d0c505e
    https://github.com/scummvm/scummvm/commit/bcd7823cffa3e6b5a19ca9f1ec59ce232d0c505e
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-11-07T14:14:25+01:00

Commit Message:
NEWS: Mention looping music fix in The Dig

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index b71fc0dd9f..c80af283a9 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -21,6 +21,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Improved support for the high-resolution text in the 16-color Macintosh
      versions of Loom and Indiana Jones and the Last Crusade.
    - Improved OPL3 sound emulation for Sam&Max.
+   - Fixed music not looping in The Dig.
 
 TwinE:
    - Numerous bugfixes and stability improvements.