[Scummvm-git-logs] scummvm master -> 2dfd023f8619906d69173e3fa1a1717ab3a7b5b7

digitall 547637+digitall at users.noreply.github.com
Tue Aug 3 13:32:32 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:
2dfd023f86 SCUMM: Remove Dead Code in Digital iMUSE


Commit: 2dfd023f8619906d69173e3fa1a1717ab3a7b5b7
    https://github.com/scummvm/scummvm/commit/2dfd023f8619906d69173e3fa1a1717ab3a7b5b7
Author: D G Turner (digitall at scummvm.org)
Date: 2021-08-03T14:31:53+01:00

Commit Message:
SCUMM: Remove Dead Code in Digital iMUSE

This has been reviewed by Andrea Boscarino.

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 bacff9c77f..a91e53bf51 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -537,23 +537,8 @@ void IMuseDigital::switchToNextRegion(Track *track) {
 		assert(sampleHookId != -1);
 
 		bool isJumpToStart = 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) {
-						Common::String markerDesc = soundDesc->marker[m].ptr;
-						if (markerDesc.contains("loop")) {
-							isJumpToLoop = true;
-						}
-						break;
-					}
-				}
-			}
-#endif
 		}
 
 		debug(5, "SwToNeReg(trackId:%d) - JUMP found - sound:%d, track hookId:%d, data hookId:%d", track->trackId, track->soundId, track->curHookId, sampleHookId);




More information about the Scummvm-git-logs mailing list