diff options
| author | Matthew Hoops | 2011-08-08 21:36:50 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-08 21:36:50 -0400 |
| commit | 677aa783707c566feea50608e2f0ba669037888b (patch) | |
| tree | 8bed08790a96c7c25a5355a20fe00e7be30aed69 /engines/scumm/sound.cpp | |
| parent | 9c52724ce56c16c7fe1e9fdd3532d7e14b53c238 (diff) | |
| parent | dbceb0a77d64d6e16b0186417ab92c425eddb173 (diff) | |
| download | scummvm-rg350-677aa783707c566feea50608e2f0ba669037888b.tar.gz scummvm-rg350-677aa783707c566feea50608e2f0ba669037888b.tar.bz2 scummvm-rg350-677aa783707c566feea50608e2f0ba669037888b.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'engines/scumm/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 33db70985d..50ae045052 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -1144,10 +1144,10 @@ int ScummEngine::readSoundResource(ResId idx) { break; } - // We only allow SPK resources for PC Speaker, PCJr and CMS here + // We only allow SPK resources for PC Speaker and PCJr here // since other resource would sound horribly with their output // drivers. - if ((_sound->_musicType == MDT_PCSPK || _sound->_musicType == MDT_PCJR || _sound->_musicType == MDT_CMS) && pri != 11) + if ((_sound->_musicType == MDT_PCSPK || _sound->_musicType == MDT_PCJR) && pri != 11) pri = -1; // We only allow ADL resources when AdLib or FM-Towns is used as |