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

[eriktorbjorn at users.sourceforge.net]

Revision: 24406
          http://svn.sourceforge.net/scummvm/?rev=24406&view=rev
Author:   eriktorbjorn
Date:     2006-10-21 05:22:30 -0700 (Sat, 21 Oct 2006)

Log Message:
-----------
Dummy handler for music commands 0xA and 0xB to keep Elvira1 from crashing. It
also seems to restore the missing first note of the intro music.

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

Modified: scummvm/trunk/engines/agos/midiparser_s1d.cpp
===================================================================
--- scummvm/trunk/engines/agos/midiparser_s1d.cpp	2006-10-21 12:03:43 UTC (rev 24405)
+++ scummvm/trunk/engines/agos/midiparser_s1d.cpp	2006-10-21 12:22:30 UTC (rev 24406)
@@ -45,7 +45,7 @@
 	bool _no_delta;
 
 protected:
-	void parseNextEvent (EventInfo &info);
+	void parseNextEvent(EventInfo &info);
 	void resetTracking();
 	uint32 readVLQ2(byte * &data);
 
@@ -97,6 +97,15 @@
 		info.length = 0;
 		break;
 
+	case 0xA:
+	case 0xB:
+		// I'm not sure what these are meant to do, or what the
+		// parameter is. Elvira 1 needs them, though, and who am I to
+		// argue with her?
+		info.basic.param1 = *(_position._play_pos++);
+		info.basic.param2 = 0;
+		break;
+
 	case 0xC:
 		info.basic.param1 = *(_position._play_pos++);
 		info.basic.param2 = 0;
@@ -112,7 +121,7 @@
 			info.length = 0;
 			break;
 		}
-		// OTherwise fall through to default.
+		// Otherwise fall through to default.
 
 	default:
 		debug(6, "MidiParser_S1D: Unexpected byte 0x%02X found", (int) info.command());


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