diff options
| author | Filippos Karapetis | 2010-01-03 16:11:31 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-01-03 16:11:31 +0000 |
| commit | 56963dc092dca549c80b1393e7395be81a920789 (patch) | |
| tree | 647db8073052fe12a88ea5439370648be3d61cea /engines/sci/sfx | |
| parent | 3da232ffdc1b5043ea1e43bf04e1f9686a0d0aa4 (diff) | |
| download | scummvm-rg350-56963dc092dca549c80b1393e7395be81a920789.tar.gz scummvm-rg350-56963dc092dca549c80b1393e7395be81a920789.tar.bz2 scummvm-rg350-56963dc092dca549c80b1393e7395be81a920789.zip | |
SCI/new music code: Some cleanup. Previous commit (rev 46928) should read: "Added some more commands from BaseSongIterator::parseMidiCommand()"
svn-id: r46930
Diffstat (limited to 'engines/sci/sfx')
| -rw-r--r-- | engines/sci/sfx/midiparser.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/engines/sci/sfx/midiparser.cpp b/engines/sci/sfx/midiparser.cpp index c2c50c7627..a69296926b 100644 --- a/engines/sci/sfx/midiparser.cpp +++ b/engines/sci/sfx/midiparser.cpp @@ -166,6 +166,14 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) { break; } break; + // Unhandled SCI commands + case 0x46: // LSL3 - binoculars + case 0x61: // Iceman (Adlib?) + case 0x73: // Hoyle + case 0xd1: // KQ4, when riding the unicorn + // Obscure SCI commands - ignored + break; + // Standard MIDI commands case 0x01: // mod wheel case 0x04: // foot controller case 0x07: // channel volume @@ -181,12 +189,6 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) { // TODO: is any support for this needed at the MIDI parser level? warning("Unhanded SCI MIDI command 0x%x - voice mapping (parameter %d)", info.basic.param1, info.basic.param2); break; - case 0x46: // LSL3 - binoculars - case 0x61: // Iceman (Adlib?) - case 0x73: // Hoyle - case 0xd1: // KQ4, when riding the unicorn - // Obscure SCI commands - ignored - break; default: warning("Unhandled SCI MIDI command 0x%x (parameter %d)", info.basic.param1, info.basic.param2); break; @@ -482,3 +484,4 @@ void MidiParser_SCI::setVolume(byte bVolume) { } } // End of namespace Sci +space Sci |