aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound
diff options
context:
space:
mode:
authorFilippos Karapetis2010-01-16 16:54:54 +0000
committerFilippos Karapetis2010-01-16 16:54:54 +0000
commit5437bf9cdae49b86eab4053fead633478576d860 (patch)
treec7b4ae47de0f07d29afcb30f3535effc9ce5f6cc /engines/sci/sound
parent0588e483b23df68a44394bb543352653474ea579 (diff)
downloadscummvm-rg350-5437bf9cdae49b86eab4053fead633478576d860.tar.gz
scummvm-rg350-5437bf9cdae49b86eab4053fead633478576d860.tar.bz2
scummvm-rg350-5437bf9cdae49b86eab4053fead633478576d860.zip
Disabled code which causes crashes/and or oddities with MIDI in later SCI games, from rev #47321
svn-id: r47324
Diffstat (limited to 'engines/sci/sound')
-rw-r--r--engines/sci/sound/music.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 95e3c66221..cfff541d0a 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -319,9 +319,10 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
channelFilterMask = pSnd->soundRes->getChannelFilterMask(_pMidiDrv->getPlayId(_soundVersion));
// Enable rhythm channel when requested
- channelFilterMask &= ~(1 << MIDI_RHYTHM_CHANNEL);
+ // FIXME: this causes crashes and/or oddities for newer games (SCI1+)
+ /*channelFilterMask &= ~(1 << MIDI_RHYTHM_CHANNEL);
if (_pMidiDrv->hasRhythmChannel())
- channelFilterMask |= (1 << MIDI_RHYTHM_CHANNEL);
+ channelFilterMask |= (1 << MIDI_RHYTHM_CHANNEL);*/
pSnd->pMidiParser->loadMusic(track, pSnd, channelFilterMask, _soundVersion);