From 8892f2ec709e4565c5cfa10496f9b192a3fe2d9d Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 16 Aug 2011 10:38:55 -0400
Subject: SCUMM: Fix AdLib output for MI2/Indy4 Mac

A regression from 69adb13c2f3cadd4dac2bba8164aa0b8a9400abc
---
 engines/scumm/sound.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 50ae045052..5aded50600 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -1157,7 +1157,9 @@ int ScummEngine::readSoundResource(ResId idx) {
 			// only contains a ROL resource for sound id 60. Formerly we tried
 			// to play that via the AdLib or FM-Towns audio driver resulting
 			// in strange noises. Now we behave like the original did.
-			if ((_sound->_musicType == MDT_ADLIB || _sound->_musicType == MDT_TOWNS) && pri != 10)
+			// We make an exception for priority 2 for the Mac output since
+			// we're doing GM -> AdLib conversion.
+			if ((_sound->_musicType == MDT_ADLIB || _sound->_musicType == MDT_TOWNS) && pri != 10 && pri != 2)
 				pri = -1;
 
 			debugC(DEBUG_RESOURCE, "    tag: %s, total_size=%d, pri=%d", tag2str(tag), size, pri);
-- 
cgit v1.2.3