[Scummvm-cvs-logs] CVS: scummvm/scumm midiparser_eup.cpp,1.3,1.4

Jamieson Christian jamieson630 at users.sourceforge.net
Tue Sep 30 09:29:01 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1330/scummvm/scumm

Modified Files:
	midiparser_eup.cpp 
Log Message:
More tweaks to the note durations

Index: midiparser_eup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/midiparser_eup.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- midiparser_eup.cpp	30 Sep 2003 07:50:20 -0000	1.3
+++ midiparser_eup.cpp	30 Sep 2003 16:27:59 -0000	1.4
@@ -93,15 +93,7 @@
 			int volume = (int) pos[5] + _presets.volume[preset];
 			pos += 6;
 			if (_presets.enable[preset]) {
-				// If the second half of the command pair is 8x,
-				// use four nibbles for the note duration. Otherwise
-				// assume it is 00 and only use two nibbles. This is
-				// a GUESS solution; however, it's clear from looking
-				// at Indy3-Towns dumps that 00 note off events use
-				// the third and fourth nibbles to report a "countdown"
-				// to the end of the song, for whatever weird reason.
-				uint16 duration = pos[1] | (pos[2] << 4) |
-					(((*pos & 0xF0) == 0x80) ? ((pos[3] << 8) | (pos[4] << 12)) : 0);
+				uint16 duration = pos[1] | (pos[2] << 4);
 				info.start = pos;
 				uint32 last = _position._last_event_tick;
 				info.delta = (tick < last) ? 0 : (tick - last);





More information about the Scummvm-git-logs mailing list