SCI: Mixed Adlib/MIDI mode for audio resources should always be enabled in SCI32

1 files changed, 10 insertions, 6 deletions

diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index b4776b30f2..e7d294dc11 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -37,7 +37,15 @@ SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segM
 
 	_music = new SciMusic(_soundVersion);
 	_music->init();
+	// Check if the user wants synthesized or digital sound effects in SCI1.1
+	// or later games
 	_bMultiMidi = ConfMan.getBool("multi_midi");
+	// In SCI2 and later games, this check should always be true - there was
+	// always only one version of each sound effect or digital music track
+	// (e.g. the menu music in GK1 - there is a sound effect with the same
+	// resource number, but it's totally unrelated to the menu music).
+	if (getSciVersion() >= SCI_VERSION_2)
+		_bMultiMidi = true;
 }
 
 SoundCommandParser::~SoundCommandParser() {
@@ -83,12 +91,8 @@ void SoundCommandParser::initSoundResource(MusicEntry *newSound) {
 	if (checkAudioResource && _resMan->testResource(ResourceId(kResourceTypeAudio, newSound->resourceId))) {
 		// Found a relevant audio resource, create an audio stream if there is
 		// no associated sound resource, or if both resources exist and the
-		// user wants the digital version. In SCI2 and later games, this check
-		// doesn't apply - there was always only one version of each sound
-		// effect or digital music track (e.g. the menu music in GK1 - there is
-		// a sound effect with the same resource number, but it's totally
-		// unrelated to the menu music).
-		if (_bMultiMidi || !newSound->soundRes || getSciVersion() >= SCI_VERSION_2) {
+		// user wants the digital version.
+		if (_bMultiMidi || !newSound->soundRes) {
 			int sampleLen;
 			newSound->pStreamAud = _audio->getAudioStream(newSound->resourceId, 65535, &sampleLen);
 			newSound->soundType = Audio::Mixer::kSpeechSoundType;