diff options
| author | Alyssa Milburn | 2011-08-17 09:28:51 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-17 09:28:51 +0200 |
| commit | ae287ccee58ebf68ab6125e5bbb4d8a44874330e (patch) | |
| tree | 2f4cee4b2940466b8a578962e0174c6f89077a40 /engines/scumm/sound.cpp | |
| parent | f5255288eabc0527c4c6b727a9db6b8d09a31206 (diff) | |
| parent | e36832bbf84cba88fe6b17e1634fab0d550f13df (diff) | |
| download | scummvm-rg350-ae287ccee58ebf68ab6125e5bbb4d8a44874330e.tar.gz scummvm-rg350-ae287ccee58ebf68ab6125e5bbb4d8a44874330e.tar.bz2 scummvm-rg350-ae287ccee58ebf68ab6125e5bbb4d8a44874330e.zip | |
Merge remote-tracking branch 'origin/master' into soccer
Conflicts:
engines/scumm/he/logic_he.cpp
engines/scumm/he/logic_he.h
Diffstat (limited to 'engines/scumm/sound.cpp')
| -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); |