Add patch #2823590 - Fix music crashes in Waxworks (PC).

svn-id: r42606
This commit is contained in:
Travis Howell 2009-07-19 09:09:56 +00:00
parent 8cb1cbfa7a
commit 29cd90ec1b
2 changed files with 4 additions and 4 deletions

View File

@ -126,6 +126,10 @@ void MidiParser_S1D::parseNextEvent(EventInfo &info) {
switch (info.event & 0x0F) {
case 0x0:
// Trigged by MOD2/MOD6/MOD15 in Waxworks
// Pure guesswork
info.ext.type = *(_position._play_pos++);
info.length = readVLQ(_position._play_pos);
info.ext.data = _position._play_pos;
break;
case 0x3: // Not sure, Song Select?

View File

@ -285,10 +285,6 @@ void AGOSEngine_Simon1::playMusic(uint16 music, uint16 track) {
void AGOSEngine::playMusic(uint16 music, uint16 track) {
stopMusic();
// FIXME: Music too unstable, when switching locations.
if (getPlatform() == Common::kPlatformPC && getGameType() == GType_WW)
return;
if (getPlatform() == Common::kPlatformAmiga) {
playModule(music);
} else if (getPlatform() == Common::kPlatformAtariST) {