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

[sluicebox]

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:
ff779d72dd SCI: Limit SCI0Early MT32.DRV parsing to expected versions


Commit: ff779d72ddb0d1d91482217dec87872663a476ad
    https://github.com/scummvm/scummvm/commit/ff779d72ddb0d1d91482217dec87872663a476ad
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-19T20:07:18-08:00

Commit Message:
SCI: Limit SCI0Early MT32.DRV parsing to expected versions

Fixes erroring when initializing a non-MT32 game like Rama when
MT32 is set as the preferred device.

Fixes bug #13946

Changed paths:
    engines/sci/sound/drivers/midi.cpp
    engines/sci/sound/music.cpp


diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index 21b765a58f0..809ac8ba11b 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -1341,7 +1341,7 @@ int MidiPlayer_Midi::open(ResourceManager *resMan) {
 			} else {
 				readMt32Patch(*res);
 			}
-		} else {
+		} else if (_version == SCI_VERSION_0_EARLY) {
 			// Early SCI0 games have the sound bank embedded in the MT-32 driver
 			readMt32DrvData();
 		}
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 73e2f535aa7..2dd6be9b3b3 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -38,8 +38,15 @@
 
 namespace Sci {
 
-SciMusic::SciMusic(SciVersion soundVersion, bool useDigitalSFX)
-	: _mutex(g_system->getMixer()->mutex()), _soundVersion(soundVersion), _soundOn(true), _masterVolume(15), _globalReverb(0), _useDigitalSFX(useDigitalSFX), _needsResume(soundVersion > SCI_VERSION_0_LATE), _globalPause(0) {
+SciMusic::SciMusic(SciVersion soundVersion, bool useDigitalSFX) :
+	_mutex(g_system->getMixer()->mutex()),
+	_soundVersion(soundVersion),
+	_soundOn(true),
+	_masterVolume(15),
+	_globalReverb(0),
+	_useDigitalSFX(useDigitalSFX),
+	_needsResume(soundVersion > SCI_VERSION_0_LATE),
+	_globalPause(0) {
 
 	// Reserve some space in the playlist, to avoid expensive insertion
 	// operations