[Scummvm-git-logs] scummvm master -> da2dc011f8445ef3a530b2e86ce38be9d733a982

[AndywinXp]

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:
da2dc011f8 SCUMM: MI1 (Ultimate Talkie): Fix #14269


Commit: da2dc011f8445ef3a530b2e86ce38be9d733a982
    https://github.com/scummvm/scummvm/commit/da2dc011f8445ef3a530b2e86ce38be9d733a982
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-02-27T00:05:57+01:00

Commit Message:
SCUMM: MI1 (Ultimate Talkie): Fix #14269

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 178e54a0bd5..4d574c206d8 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1313,8 +1313,11 @@ void ScummEngine::setupScumm(const Common::String &macResourceFile) {
 		} else
 			track = 1;
 
+		// The Ultimate Talkie version of Monkey Island 1 provides an automatic
+		// fallback with MIDI music when CD tracks are not found.
 		if (!existExtractedCDAudioFiles(track)
-		    && !isDataAndCDAudioReadFromSameCD()) {
+		    && !isDataAndCDAudioReadFromSameCD()
+			&& !(_game.id == GID_MONKEY && _game.features & GF_ULTIMATE_TALKIE)) {
 			warnMissingExtractedCDAudio();
 		}
 		_system->getAudioCDManager()->open();