[Scummvm-cvs-logs] SF.net SVN: scummvm:[42606] scummvm/trunk/engines/agos

[Kirben at users.sourceforge.net]

Revision: 42606
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42606&view=rev
Author:   Kirben
Date:     2009-07-19 09:09:56 +0000 (Sun, 19 Jul 2009)

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

Modified Paths:
--------------
    scummvm/trunk/engines/agos/midiparser_s1d.cpp
    scummvm/trunk/engines/agos/res_snd.cpp

Modified: scummvm/trunk/engines/agos/midiparser_s1d.cpp
===================================================================
--- scummvm/trunk/engines/agos/midiparser_s1d.cpp	2009-07-19 01:43:50 UTC (rev 42605)
+++ scummvm/trunk/engines/agos/midiparser_s1d.cpp	2009-07-19 09:09:56 UTC (rev 42606)
@@ -126,6 +126,10 @@
 		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?

Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp	2009-07-19 01:43:50 UTC (rev 42605)
+++ scummvm/trunk/engines/agos/res_snd.cpp	2009-07-19 09:09:56 UTC (rev 42606)
@@ -285,10 +285,6 @@
 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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.