thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Committed my patch #2040074 ("XMIDI callback control events"). At the moment, I'm

Browse source 
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
This commit is contained in:
Torbjörn Andersson 2008-08-10 17:59:42 +00:00
parent 327ae17095
commit d08c3ba66b
3 changed files with 53 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/agos/midi.cpp
View file

@ -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))