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

[Pawel Kolodziejski]

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

Modified Files:
	resource.cpp scumm.h 
Log Message:
changed read order of CMI variables (MAXS)

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- resource.cpp	23 Dec 2002 17:21:09 -0000	1.35
+++ resource.cpp	23 Dec 2002 18:53:04 -0000	1.36
@@ -1517,25 +1517,25 @@
 
 void Scumm::readMAXS()
 {
-	if (_features & GF_AFTER_V8) {
-		_fileHandle.seek(50 + 50, SEEK_CUR);
-		_numVariables = _fileHandle.readUint32LE();	/* ? 1500 */
-		_numBitVariables = _fileHandle.readUint32LE();	/* ? 2048 */
-		_fileHandle.readUint32LE();					/* 40 */
-		_numScripts = _fileHandle.readUint32LE();
-		_numSounds = _fileHandle.readUint32LE();
-		_numCharsets = _fileHandle.readUint32LE();
-		_numCostumes = _fileHandle.readUint32LE();
-		_numRooms = _fileHandle.readUint32LE();
-		_numInventory = _fileHandle.readUint32LE();
-		_numGlobalObjects = _fileHandle.readUint32LE();
-		_numFlObject = _fileHandle.readUint32LE();
-		_numLocalObjects = _fileHandle.readUint32LE();
-		_numVerbs = _fileHandle.readUint32LE();
-		_numNewNames = _fileHandle.readUint32LE();
-		_fileHandle.readUint32LE();
-		_fileHandle.readUint32LE();
-		_numArray = _fileHandle.readUint32LE();
+	if (_features & GF_AFTER_V8) {										// CMI
+		_fileHandle.seek(50 + 50, SEEK_CUR);						// 176 - 8
+		_numVariables = _fileHandle.readUint32LE();			// 1500
+		_numBitVariables = _fileHandle.readUint32LE();	// 2048
+		_fileHandle.readUint32LE();											// 40
+		_numScripts = _fileHandle.readUint32LE();				// 458
+		_numSounds = _fileHandle.readUint32LE();				// 789
+		_numCharsets = _fileHandle.readUint32LE();			// 1
+		_numCostumes = _fileHandle.readUint32LE();			// 446
+		_numRooms = _fileHandle.readUint32LE();					// 95
+		_fileHandle.readUint32LE();											// 80
+		_numGlobalObjects = _fileHandle.readUint32LE();	// 1401
+		_fileHandle.readUint32LE();											// 60
+		_numLocalObjects = _fileHandle.readUint32LE();	// 200
+		_numNewNames = _fileHandle.readUint32LE();			// 100
+		_numFlObject = _fileHandle.readUint32LE();			// 128
+		_numInventory = _fileHandle.readUint32LE();			// 80
+		_numStrings = _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 ?!?

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