diff options
| author | Martin Kiewitz | 2010-06-19 19:16:42 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-06-19 19:16:42 +0000 |
| commit | 447f1270139890877ecdc32c06138f88525e1458 (patch) | |
| tree | 40a848d11af4e30b46d514663d6440f72443ba47 /engines/sci/sound | |
| parent | ed50ecd62d21e728480710e64aea79c5d132ac77 (diff) | |
| download | scummvm-rg350-447f1270139890877ecdc32c06138f88525e1458.tar.gz scummvm-rg350-447f1270139890877ecdc32c06138f88525e1458.tar.bz2 scummvm-rg350-447f1270139890877ecdc32c06138f88525e1458.zip | |
SCI: fixing uninitialized usage in MidiParser_SCI
svn-id: r50057
Diffstat (limited to 'engines/sci/sound')
| -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 931919b2b5..71d363d172 100644 --- a/engines/sci/sound/midiparser_sci.cpp +++ b/engines/sci/sound/midiparser_sci.cpp @@ -73,9 +73,6 @@ bool MidiParser_SCI::loadMusic(SoundResource::Track *track, MusicEntry *psnd, in _pSnd = psnd; _soundVersion = soundVersion; - if (_pSnd) - setVolume(psnd->volume); - for (int i = 0; i < 15; i++) { _channelUsed[i] = false; _channelRemap[i] = -1; @@ -84,6 +81,9 @@ 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); |