[Scummvm-cvs-logs] CVS: scummvm/scumm resource_v2.cpp,1.12,1.13

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Apr 20 13:59:02 CEST 2003


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

Modified Files:
	resource_v2.cpp 
Log Message:
added loading global objects states for v2

Index: resource_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- resource_v2.cpp	20 Apr 2003 16:37:43 -0000	1.12
+++ resource_v2.cpp	20 Apr 2003 20:58:00 -0000	1.13
@@ -57,8 +57,11 @@
 	_palManipIntermediatePal = 0; // Will allocate when needed
 
 	_fileHandle.readUint16LE(); /* version magic number */
-	_fileHandle.readUint16LE(); /* nb global objects */
-	_fileHandle.seek(_numGlobalObjects, SEEK_CUR); // Skip object flags
+	int num = _fileHandle.readUint16LE();
+	assert(num == _numGlobalObjects);
+	for (int i = 0; i != num; i++) {
+		_objectStateTable[i] = _fileHandle.readByte();
+	}
 	readResTypeList(rtRoom, MKID('ROOM'), "room");
 	readResTypeList(rtCostume, MKID('COST'), "costume");
 	readResTypeList(rtScript, MKID('SCRP'), "script");





More information about the Scummvm-git-logs mailing list