[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.36,1.37 scumm.h,1.93,1.94

Pawel Kolodziejski aquadran at users.sourceforge.net
Mon Dec 23 11:04:02 CET 2002


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

Modified Files:
	resource.cpp scumm.h 
Log Message:
changed numString to numArray

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- resource.cpp	23 Dec 2002 18:53:04 -0000	1.36
+++ resource.cpp	23 Dec 2002 19:03:07 -0000	1.37
@@ -1534,12 +1534,8 @@
 		_numNewNames = _fileHandle.readUint32LE();			// 100
 		_numFlObject = _fileHandle.readUint32LE();			// 128
 		_numInventory = _fileHandle.readUint32LE();			// 80
-		_numStrings = _fileHandle.readUint32LE();				// 200
+		_numArray = _fileHandle.readUint32LE();				// 200
 		_numVerbs = _fileHandle.readUint32LE();					// 50
-
-		// FIXME - uhm... COMI seems to have an ARRY with 143 entries, but
-		// indeed _numArray gets set to 50 ?!?
-		_numArray = 150;
 
 		_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
 		_numGlobalScripts = 2000;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- scumm.h	23 Dec 2002 18:53:04 -0000	1.93
+++ scumm.h	23 Dec 2002 19:03:08 -0000	1.94
@@ -380,7 +380,6 @@
 	int _numInventory, _numRooms, _numScripts, _numSounds;
 	int _numCharsets, _numCostumes, _numNewNames, _numGlobalScripts;
 	int NUM_ACTORS;
-	int _numStrings;
 
 	char *_audioNames;
 	int32 _numAudioNames;





More information about the Scummvm-git-logs mailing list