[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.264,1.265

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15088/scumm

Modified Files:
	resource.cpp 
Log Message:

Verified values.
No extra object data in later HE games.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- resource.cpp	8 Sep 2004 05:58:36 -0000	1.264
+++ resource.cpp	8 Sep 2004 06:35:38 -0000	1.265
@@ -2294,8 +2294,8 @@
 		_shadowPaletteSize = NUM_SHADOW_PALETTE * 256;
 	} else if (_heversion >= 70 && (blockSize == 44 + 8)) { // C++ based engine
 		_numVariables = _fileHandle.readUint16LE();
-		_fileHandle.readUint16LE(); // not used in spydemo
-		_fileHandle.readUint16LE(); // _numLocalVariables ?
+		_fileHandle.readUint16LE();
+		_fileHandle.readUint16LE();
 		_numLocalObjects = _fileHandle.readUint16LE();
 		_numArray = _fileHandle.readUint16LE();
 		_fileHandle.readUint16LE(); // unknown
@@ -2315,23 +2315,18 @@
 		_fileHandle.readUint16LE(); // _numPalettes?
 		_fileHandle.readUint16LE(); // _numSmacker?
 		_numTalkies = _fileHandle.readUint16LE();
-
-		/* TODO check these values */
+		_numNewNames = 10;
 
 		_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
-
-		_numNewNames = 10;
 		_numRoomVariables = 64;
-
-		_objectRoomTable = (byte *)calloc(_numGlobalObjects * 4, 1);
-
 		_numGlobalScripts = 200;
+
 		_shadowPaletteSize = 256;
 
 	} else if (_heversion >= 70 && (blockSize == 38 + 8)) { // Scummsys.9x
 		_numVariables = _fileHandle.readUint16LE();
-		_fileHandle.readUint16LE(); // not used in spydemo
-		_fileHandle.readUint16LE(); // _numLocalVariables ?
+		_fileHandle.readUint16LE();
+		_fileHandle.readUint16LE();
 		_numLocalObjects = _fileHandle.readUint16LE();
 		_numArray = _fileHandle.readUint16LE();
 		_fileHandle.readUint16LE(); // unknown
@@ -2348,17 +2343,12 @@
 		_numSprites = _fileHandle.readUint16LE();
 		_numLocalScriptOffsets = _fileHandle.readUint16LE();
 		_fileHandle.readUint16LE(); // heap releated
-
-		/* TODO check these values */
+		_numNewNames = 10;
 
 		_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
-
-		_numNewNames = 10;
 		_numRoomVariables = 64;
-
-		_objectRoomTable = (byte *)calloc(_numGlobalObjects * 4, 1);
-
 		_numGlobalScripts = 200;
+
 		_shadowPaletteSize = 256;
 	} else if (_heversion >= 70 && blockSize > 38) { // sputm7.2
 		if (blockSize != 32 + 8)
@@ -2379,14 +2369,11 @@
 		_numCostumes = _fileHandle.readUint16LE();
 		_numGlobalObjects = _fileHandle.readUint16LE();
 		_numImages = _fileHandle.readUint16LE();
-
-		_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
-
 		_numNewNames = 10;
 
-		_objectRoomTable = (byte *)calloc(_numGlobalObjects * 4, 1);
-
+		_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
 		_numGlobalScripts = 200;
+
 		_shadowPaletteSize = 256;
 	} else if (_version == 6) {
 		if (blockSize != 30 + 8)