diff options
| author | Torbjörn Andersson | 2008-08-10 17:59:42 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2008-08-10 17:59:42 +0000 |
| commit | d08c3ba66ba81a06ef681ea9a49334a80d296609 (patch) | |
| tree | b9f521c67cfbff94018135a23947e2224ba5da2a /engines | |
| parent | 327ae17095edb51b2df0ada8cd8eba28463c5127 (diff) | |
| download | scummvm-rg350-d08c3ba66ba81a06ef681ea9a49334a80d296609.tar.gz scummvm-rg350-d08c3ba66ba81a06ef681ea9a49334a80d296609.tar.bz2 scummvm-rg350-d08c3ba66ba81a06ef681ea9a49334a80d296609.zip | |
Committed my patch #2040074 ("XMIDI callback control events"). At the moment, I'm
not aware of any game that actually uses this XMIDI feature, so its primary
function right now is to silence lots of warnings while running the DOS version
of Simon the Sorcerer 2.
svn-id: r33763
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/agos/midi.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp index 3114b24549..891e9bde95 100644 --- a/engines/agos/midi.cpp +++ b/engines/agos/midi.cpp @@ -538,7 +538,11 @@ void MidiPlayer::loadXMIDI(Common::File *in, bool sfx) { error("Expected 'FORM' tag but found '%c%c%c%c' instead", buf[0], buf[1], buf[2], buf[3]); } - MidiParser *parser = MidiParser::createParser_XMIDI(); + // In the DOS version of Simon the Sorcerer 2, the music contains lots + // of XMIDI callback controller events. As far as we know, they aren't + // actually used, so we disable the callback handler explicitly. + + MidiParser *parser = MidiParser::createParser_XMIDI(NULL); parser->setMidiDriver(this); parser->setTimerRate(_driver->getBaseTempo()); if (!parser->loadMusic(p->data, size)) |