diff options
| author | Filippos Karapetis | 2010-06-18 02:16:00 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-18 02:16:00 +0000 |
| commit | 0eee4e79bf320a2b068a1460613e879751853b17 (patch) | |
| tree | 4883b060e1a9911be5e0e4f0e9b442192f4ca75b | |
| parent | 31930b6d09a711a1c1ed708d2f23a6fc05ba2d63 (diff) | |
| download | scummvm-rg350-0eee4e79bf320a2b068a1460613e879751853b17.tar.gz scummvm-rg350-0eee4e79bf320a2b068a1460613e879751853b17.tar.bz2 scummvm-rg350-0eee4e79bf320a2b068a1460613e879751853b17.zip | |
Changed an assert into a warning with a FIXME (happens in SQ1)
svn-id: r49994
| -rw-r--r-- | engines/sci/sound/midiparser_sci.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp index 1ea990332b..b2ccbd5c81 100644 --- a/engines/sci/sound/midiparser_sci.cpp +++ b/engines/sci/sound/midiparser_sci.cpp @@ -160,7 +160,12 @@ void MidiParser_SCI::sendToDriver(uint32 b) { return; // Channel remapping int16 realChannel = _channelRemap[midiChannel]; - assert(realChannel != -1); + if (realChannel == -1) { + // FIXME: Happens in SQ1VGA when the game starts + warning("Attempt to send to uninitialized channel %d", midiChannel); + return; + } + b = (b & 0xFFFFFFF0) | realChannel; _driver->send(b); } |