[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.177,1.178 scumm.cpp,1.238,1.239 scumm.h,1.503,1.504

Travis Howell kirben at users.sourceforge.net
Wed Sep 29 23:41:01 CEST 2004


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

Modified Files:
	saveload.cpp scumm.cpp scumm.h 
Log Message:

Number of local scripts is no longer constant


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- saveload.cpp	21 Sep 2004 12:44:33 -0000	1.177
+++ saveload.cpp	30 Sep 2004 06:39:39 -0000	1.178
@@ -449,7 +449,7 @@
 		MKLINE(ScummEngine, _roomResource, sleByte, VER(8)),
 		MKLINE(ScummEngine, _numObjectsInRoom, sleByte, VER(8)),
 		MKLINE(ScummEngine, _currentScript, sleByte, VER(8)),
-		MKARRAY(ScummEngine, _localScriptList[0], sleUint32, NUM_LOCALSCRIPT, VER(8)),
+		MKARRAY(ScummEngine, _localScriptList[0], sleUint32, _numLocalScripts, VER(8)),
 
 
 		// vm.localvar grew from 25 to 40 script entries and then from

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- scumm.cpp	29 Sep 2004 21:45:52 -0000	1.238
+++ scumm.cpp	30 Sep 2004 06:39:39 -0000	1.239
@@ -537,7 +537,7 @@
 	_numActors = 0;
 	_numCostumes = 0;
 	_numImages = 0;
-	_numLocalScripts = 0;
+	_numLocalScripts = 60;
 	_numSprites = 0;
 	_numTalkies = 0;
 	_audioNames = NULL;
@@ -2224,11 +2224,11 @@
 
 			if (_version == 8) {
 				id = READ_LE_UINT32(ptr);
-				checkRange(NUM_LOCALSCRIPT + _numGlobalScripts, _numGlobalScripts, id, "Invalid local script %d");
+				checkRange(_numLocalScripts + _numGlobalScripts, _numGlobalScripts, id, "Invalid local script %d");
 				_localScriptList[id - _numGlobalScripts] = ptr + 4 - roomResPtr;
 			} else if (_version == 7) {
 				id = READ_LE_UINT16(ptr);
-				checkRange(NUM_LOCALSCRIPT + _numGlobalScripts, _numGlobalScripts, id, "Invalid local script %d");
+				checkRange(_numLocalScripts + _numGlobalScripts, _numGlobalScripts, id, "Invalid local script %d");
 				_localScriptList[id - _numGlobalScripts] = ptr + 2 - roomResPtr;
 			} else {
 				id = ptr[0];

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -d -r1.503 -r1.504
--- scumm.h	29 Sep 2004 21:45:52 -0000	1.503
+++ scumm.h	30 Sep 2004 06:39:39 -0000	1.504
@@ -88,7 +88,6 @@
 
 /* System Wide Constants */
 enum {
-	NUM_LOCALSCRIPT = 60,
 	NUM_SENTENCE = 6,
 	NUM_SHADOW_PALETTE = 8,
 	KEY_ALL_SKIP = 3457   // WinCE
@@ -570,7 +569,7 @@
 	uint32 _maxHeapThreshold, _minHeapThreshold;
 
 	/* Script VM - should be in Script class */
-	uint32 _localScriptList[NUM_LOCALSCRIPT];
+	uint32 _localScriptList[256];
 	const byte *_scriptPointer, *_scriptOrgPointer;
 	byte _opcode, _currentScript;
 	uint16 _curExecScript;





More information about the Scummvm-git-logs mailing list