[Scummvm-cvs-logs] SF.net SVN: scummvm: [30202] scummvm/trunk/engines/scumm/midiparser_ro.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 30202
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30202&view=rev
Author:   eriktorbjorn
Date:     2008-01-03 11:43:43 -0800 (Thu, 03 Jan 2008)

Log Message:
-----------
Made the Loom Roland music fix a bit more specific. Only one song in EGA Loom
is affected and, according to Kirben, none in Monkey Island 1 VGA. I don't know
about Monkey Island 1 EGA, but I've assumed it uses the same music as the VGA
versions.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/midiparser_ro.cpp

Modified: scummvm/trunk/engines/scumm/midiparser_ro.cpp
===================================================================
--- scummvm/trunk/engines/scumm/midiparser_ro.cpp	2008-01-03 15:20:33 UTC (rev 30201)
+++ scummvm/trunk/engines/scumm/midiparser_ro.cpp	2008-01-03 19:43:43 UTC (rev 30202)
@@ -69,18 +69,15 @@
 		if (info.command() == 0xA) {
 			++_lastMarkerCount;
 			info.event = 0xF0;
-		} else if (info.command() == 0xF && info.event != 0xFF) {
+		} else if (info.event == 0xF0 || info.event == 0xF1) {
 			byte delay = *(_position._play_pos++);
 			info.delta += delay;
-			if (info.event != 0xF0) {
-				// The event is usually 0xF0 but there are a
-				// few cases in EGA Loom where it's 0xF1. I'm
-				// speculating that this is for adding values
-				// greater than 255 to info.delta. See bug
-				// #1498785.
-				//
-				// The actual calculation is pure guesswork,
-				// but the result sounds good enough to me.
+			if (info.event == 0xF1) {
+				// This event is, as far as we have been able
+				// to determine, only used in one single song
+				// in EGA Loom. It seems to be meant for adding
+				// values greater than 255 to info.delta. See
+				// bug #1498785.
 				info.delta += 256;
 			}
 			continue;


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