[Scummvm-git-logs] scummvm master -> 3818905d164f03c0ed70b564b2f54867dcce3e51

[digitall]

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:
3818905d16 SCUMM: Further Cleanup of Dead Code in Digital iMUSE


Commit: 3818905d164f03c0ed70b564b2f54867dcce3e51
    https://github.com/scummvm/scummvm/commit/3818905d164f03c0ed70b564b2f54867dcce3e51
Author: D G Turner (digitall at scummvm.org)
Date: 2021-08-03T03:50:03+01:00

Commit Message:
SCUMM: Further Cleanup of Dead Code in Digital iMUSE

This fixes a GCC set-but-unused variable warning.

This code may need to be reinstated for looping so commenting out
for review.

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 ac67b8cc1a..bacff9c77f 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -537,9 +537,11 @@ void IMuseDigital::switchToNextRegion(Track *track) {
 		assert(sampleHookId != -1);
 
 		bool isJumpToStart = false;
-		bool isJumpToLoop = false;
+		//bool isJumpToLoop = false;
 		if (_vm->_game.id == GID_CMI) {
 			isJumpToStart = (soundDesc->jump[jumpId].dest == soundDesc->marker[2].pos && !scumm_stricmp(soundDesc->marker[2].ptr, "start"));
+#if 0
+			// FIXME: Remove dead code?
 			if (!isJumpToStart) {
 				for (int m = 0; m < soundDesc->numMarkers; m++) {
 					if (soundDesc->jump[jumpId].dest == soundDesc->marker[m].pos) {
@@ -551,6 +553,7 @@ void IMuseDigital::switchToNextRegion(Track *track) {
 					}
 				}
 			}
+#endif
 		}
 
 		debug(5, "SwToNeReg(trackId:%d) - JUMP found - sound:%d, track hookId:%d, data hookId:%d", track->trackId, track->soundId, track->curHookId, sampleHookId);