[Scummvm-cvs-logs] CVS: scummvm/scumm resource_v3.cpp,1.13,1.14

[Pawel Kolodziejski]

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

Modified Files:
	resource_v3.cpp 
Log Message:
added loading object flags for loom ega

Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- resource_v3.cpp	11 Apr 2003 11:51:41 -0000	1.13
+++ resource_v3.cpp	11 Apr 2003 16:25:09 -0000	1.14
@@ -59,8 +59,18 @@
 		_palManipIntermediatePal = 0; // Will allocate when needed
 
 		_fileHandle.readUint16LE(); /* version magic number */
-		_fileHandle.readUint16LE(); /* nb global objects */
-		_fileHandle.seek(_numGlobalObjects * 4, SEEK_CUR); // Skip object flags
+		int num = _fileHandle.readUint16LE();
+		assert(num == _numGlobalObjects);
+		for (int i = 0; i != num; i++) {
+			uint32 bits = _fileHandle.readByte();
+			byte tmp;
+			bits |= _fileHandle.readByte() << 8;
+			bits |= _fileHandle.readByte() << 16;
+			_classData[i] = bits;
+			tmp = _fileHandle.readByte();
+			_objectOwnerTable[i] = tmp & OF_OWNER_MASK;
+			_objectStateTable[i] = tmp >> OF_STATE_SHL;
+		}
 		readResTypeList(rtRoom, MKID('ROOM'), "room");
 		readResTypeList(rtCostume, MKID('COST'), "costume");
 		readResTypeList(rtScript, MKID('SCRP'), "script");