[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.75,1.76

Max Horn fingolfin at users.sourceforge.net
Tue Jul 8 09:48:06 CEST 2003


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

Modified Files:
	costume.cpp 
Log Message:
_dataOffsets has the correct value now (based on comparisions of repeated offsets in the offsets tables, and matching them up between V1 and V2)

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- costume.cpp	8 Jul 2003 16:31:01 -0000	1.75
+++ costume.cpp	8 Jul 2003 16:47:15 -0000	1.76
@@ -539,7 +539,7 @@
 	}
 	ptr += 8 + _numColors;
 	_frameOffsets = ptr + 2;
-	_dataOffsets = ptr + ((_vm->_version == 1) ? 20 : 34);	// FIXME - V1 case might be wrong
+	_dataOffsets = ptr + ((_vm->_version == 1) ? 18 : 34);	// FIXME - V1 case might be wrong
 	_animCmds = _baseptr + READ_LE_UINT16(ptr);
 }
 
@@ -632,12 +632,13 @@
 	// FIXME: Maybe V1 only ready one byte here? At least it seems by comparing the
 	// V1 and V2 data that there is a 1-byte len difference.
 /*	if (_version == 1) {
-		mask = *r++;
+		mask = *r++ << 8;
 	} else {
 */
 		mask = READ_LE_UINT16(r);
 		r += 2;
 //	}
+//printf("mask = 0x%x, usemask = 0x%x\n", mask, usemask);
 	i = 0;
 	do {
 		if (mask & 0x8000) {





More information about the Scummvm-git-logs mailing list