[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.268,1.269 scumm.cpp,1.202,1.203

Travis Howell kirben at users.sourceforge.net
Thu Sep 16 02:21:04 CEST 2004


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

Modified Files:
	resource.cpp scumm.cpp 
Log Message:

Correct local script range in HE99+


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -d -r1.268 -r1.269
--- resource.cpp	8 Sep 2004 07:10:43 -0000	1.268
+++ resource.cpp	16 Sep 2004 09:20:49 -0000	1.269
@@ -2318,7 +2318,7 @@
 
 		_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
 		_numRoomVariables = 64;
-		_numGlobalScripts = 200;
+		_numGlobalScripts = 2048;
 
 	} else if (_heversion >= 70 && (blockSize == 38 + 8)) { // Scummsys.9x
 		_numVariables = _fileHandle.readUint16LE();

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- scumm.cpp	14 Sep 2004 21:59:46 -0000	1.202
+++ scumm.cpp	16 Sep 2004 09:20:49 -0000	1.203
@@ -2735,7 +2735,7 @@
 			ptr += _resourceHeaderSize;	/* skip tag & size */
 
 			id = READ_LE_UINT32(ptr);
-			//checkRange(NUM_LOCALSCRIPT + _numGlobalScripts, _numGlobalScripts, id, "Invalid local script %d");
+			checkRange(NUM_LOCALSCRIPT + _numGlobalScripts, _numGlobalScripts, id, "Invalid local script %d");
 			_localScriptList[id - _numGlobalScripts] = ptr + 4 - roomResPtr;
 
 			if (_dumpScripts) {





More information about the Scummvm-git-logs mailing list