diff options
| author | Christopher Page | 2008-08-10 21:58:18 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-08-10 21:58:18 +0000 |
| commit | fcc00f20b93d719c9f7bce848ed7c3600be982b9 (patch) | |
| tree | 48b9fd1c842cb376985a91592ef7b062fed0cfa7 /engines/agos/midi.cpp | |
| parent | ce3d1e1a7d9ec9860d3fc42d8127a1634051d950 (diff) | |
| parent | 9d0b0523cf119fdc400bf477c2f9d6f4f37ddce6 (diff) | |
| download | scummvm-rg350-fcc00f20b93d719c9f7bce848ed7c3600be982b9.tar.gz scummvm-rg350-fcc00f20b93d719c9f7bce848ed7c3600be982b9.tar.bz2 scummvm-rg350-fcc00f20b93d719c9f7bce848ed7c3600be982b9.zip | |
Merged revisions 33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r33769
Diffstat (limited to 'engines/agos/midi.cpp')
| -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 6d24c7db2c..fd0e4eaa9d 100644 --- a/engines/agos/midi.cpp +++ b/engines/agos/midi.cpp @@ -556,7 +556,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)) |