diff options
| author | Martin Kiewitz | 2010-06-19 19:39:36 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-06-19 19:39:36 +0000 |
| commit | a845e8b859e215a24e68bfbc5990153faf733548 (patch) | |
| tree | 99881f1c7c6dd6da8bba58bf49533989693b1196 /engines | |
| parent | 447f1270139890877ecdc32c06138f88525e1458 (diff) | |
| download | scummvm-rg350-a845e8b859e215a24e68bfbc5990153faf733548.tar.gz scummvm-rg350-a845e8b859e215a24e68bfbc5990153faf733548.tar.bz2 scummvm-rg350-a845e8b859e215a24e68bfbc5990153faf733548.zip | |
SCI: move setVolume down inside loadMusic so that it actually affects the used channels
svn-id: r50058
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/sound/midiparser_sci.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp index 71d363d172..18eaba3de6 100644 --- a/engines/sci/sound/midiparser_sci.cpp +++ b/engines/sci/sound/midiparser_sci.cpp @@ -81,9 +81,6 @@ bool MidiParser_SCI::loadMusic(SoundResource::Track *track, MusicEntry *psnd, in _channelRemap[9] = 9; // never map channel 9, because that's used for percussion _channelRemap[15] = 15; // never map channel 15, because thats used by sierra internally - if (_pSnd) - setVolume(psnd->volume); - if (channelFilterMask) { // SCI0 only has 1 data stream, but we need to filter out channels depending on music hardware selection midiFilterChannels(channelFilterMask); @@ -91,6 +88,9 @@ bool MidiParser_SCI::loadMusic(SoundResource::Track *track, MusicEntry *psnd, in midiMixChannels(); } + if (_pSnd) + setVolume(_pSnd->volume); + _num_tracks = 1; _tracks[0] = _mixedData; if (_pSnd) |