diff options
| author | Matthew Hoops | 2011-08-16 10:38:55 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-16 10:44:20 -0400 |
| commit | 8892f2ec709e4565c5cfa10496f9b192a3fe2d9d (patch) | |
| tree | a8ab460c54e2173f08fff0297044757100ad0d33 | |
| parent | c280824b2d749be01e7346597d28da04419b5798 (diff) | |
| download | scummvm-rg350-8892f2ec709e4565c5cfa10496f9b192a3fe2d9d.tar.gz scummvm-rg350-8892f2ec709e4565c5cfa10496f9b192a3fe2d9d.tar.bz2 scummvm-rg350-8892f2ec709e4565c5cfa10496f9b192a3fe2d9d.zip | |
SCUMM: Fix AdLib output for MI2/Indy4 Mac
A regression from 69adb13c2f3cadd4dac2bba8164aa0b8a9400abc
| -rw-r--r-- | engines/scumm/sound.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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); |