[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.276,1.277

Travis Howell kirben at users.sourceforge.net
Thu Sep 30 00:27:01 CEST 2004


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

Modified Files:
	resource.cpp 
Log Message:

Actually always stored in index


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- resource.cpp	30 Sep 2004 06:46:02 -0000	1.276
+++ resource.cpp	30 Sep 2004 07:26:21 -0000	1.277
@@ -2294,7 +2294,7 @@
 	} else if (_heversion >= 70 && (blockSize == 44 + 8)) { // C++ based engine
 		_numVariables = _fileHandle.readUint16LE();
 		_fileHandle.readUint16LE();
-		_fileHandle.readUint16LE();
+		_numRoomVariables = _fileHandle.readUint16LE();
 		_numLocalObjects = _fileHandle.readUint16LE();
 		_numArray = _fileHandle.readUint16LE();
 		_fileHandle.readUint16LE(); // unknown
@@ -2317,13 +2317,12 @@
 		_numNewNames = 10;
 
 		_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
-		_numRoomVariables = 256;
 		_numGlobalScripts = 2048;
 
 	} else if (_heversion >= 70 && (blockSize == 38 + 8)) { // Scummsys.9x
 		_numVariables = _fileHandle.readUint16LE();
 		_fileHandle.readUint16LE();
-		_fileHandle.readUint16LE();
+		_numRoomVariables = _fileHandle.readUint16LE();
 		_numLocalObjects = _fileHandle.readUint16LE();
 		_numArray = _fileHandle.readUint16LE();
 		_fileHandle.readUint16LE(); // unknown
@@ -2343,7 +2342,6 @@
 		_numNewNames = 10;
 
 		_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
-		_numRoomVariables = 256;
 		if (_gameId == GID_FREDDI4)
 			_numGlobalScripts = 2048;
 		else





More information about the Scummvm-git-logs mailing list