[Scummvm-cvs-logs] scummvm master -> 8892f2ec709e4565c5cfa10496f9b192a3fe2d9d

clone2727 clone2727 at gmail.com
Tue Aug 16 16:47:03 CEST 2011


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:
8892f2ec70 SCUMM: Fix AdLib output for MI2/Indy4 Mac


Commit: 8892f2ec709e4565c5cfa10496f9b192a3fe2d9d
    https://github.com/scummvm/scummvm/commit/8892f2ec709e4565c5cfa10496f9b192a3fe2d9d
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-08-16T07:44:20-07:00

Commit Message:
SCUMM: Fix AdLib output for MI2/Indy4 Mac

A regression from 69adb13c2f3cadd4dac2bba8164aa0b8a9400abc

Changed paths:
    engines/scumm/sound.cpp



diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 50ae045..5aded50 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);






More information about the Scummvm-git-logs mailing list