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

Ignore unknown SysEx manufacturer IDs, rather than erroring on them. This does

Browse source 
NOT fix bug #1481383, even if that's where I heard about this problem.

svn-id: r22479
This commit is contained in:
Torbjörn Andersson 2006-05-15 13:19:30 +00:00
parent 0191738cce
commit e723f7d1eb
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/scumm/imuse/imuse_player.cpp
View file

@ -369,7 +369,13 @@ void Player::sysEx(const byte *p, uint16 len) {
// FM-TOWNS custom instrument definition
_midi->sysEx_customInstrument(p[0], 'EUP ', p + 1);
} else {
error("Unknown SysEx manufacturer 0x%02X", (int)a);
// SysEx manufacturer 0x97 has been spotted in the
// Monkey Island 2 Adlib music, so don't make this a
// fatal error. See bug #1481383.
if (a == 0)
warning("Unknown SysEx manufacturer 0x00 0x%02X 0x%02X", p[0], p[1]);
else
warning("Unknown SysEx manufacturer 0x%02X", (int)a);
}
return;
}