[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.84,1.85

[Jamieson Christian]

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

Modified Files:
	resource.cpp 
Log Message:
Fixed PPQN for old 'AD' music resources

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- resource.cpp	21 May 2003 18:09:46 -0000	1.84
+++ resource.cpp	23 May 2003 04:47:47 -0000	1.85
@@ -1092,9 +1092,11 @@
 		ptr[0] = 0; ptr[1] = 0; ptr[2] = 0; ptr[3] = 1; // MIDI format 0 with 1 track
 		ptr += 4;
 
-		// FIXME: should we convert ticks here? I.e. BE vs LE, or maybe another scale is
-		// needed? In fact does anything *read* this value, ever?
-		memcpy(ptr, &ticks, 2); ptr += 2;
+		// We will ignore the PPQN in the original resource, because
+		// it's invalid anyway. We use a constant PPQN of 480.
+		// memcpy(ptr, &ticks, 2); ptr += 2;
+		*ptr++ = 480 >> 8;
+		*ptr++ = 480 & 0xFF;
 
 		memcpy(ptr, "MTrk", 4); ptr += 4;
 		*ptr++ = ((sizeof(OLD256_MIDI_HACK) + size + 7) >> 24) & 0xFF;