[Scummvm-cvs-logs] SF.net SVN: scummvm: [20709] scummvm/trunk/engines/scumm/resource.cpp

[kirben at users.sourceforge.net]

Revision: 20709
Author:   kirben
Date:     2006-02-15 15:04:48 -0800 (Wed, 15 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20709&view=rev

Log Message:
-----------
Read correct index by block size in HE games again, to help track down unknown versions.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/resource.cpp
Modified: scummvm/trunk/engines/scumm/resource.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource.cpp	2006-02-15 23:02:37 UTC (rev 20708)
+++ scummvm/trunk/engines/scumm/resource.cpp	2006-02-15 23:04:48 UTC (rev 20709)
@@ -1233,35 +1233,37 @@
 #endif
 
 void ScummEngine_v6::readMAXS(int blockSize) {
-	debug(0, "ScummEngine_v6 readMAXS: MAXS has blocksize %d", blockSize);
+	if (blockSize == 38) {
+		debug(0, "ScummEngine_v6 readMAXS: MAXS has blocksize %d", blockSize);
 
-	_numVariables = _fileHandle->readUint16LE();
-	_fileHandle->readUint16LE();
-	_numBitVariables = _fileHandle->readUint16LE();
-	_numLocalObjects = _fileHandle->readUint16LE();
-	_numArray = _fileHandle->readUint16LE();
-	_fileHandle->readUint16LE();
-	_numVerbs = _fileHandle->readUint16LE();
-	_numFlObject = _fileHandle->readUint16LE();
-	_numInventory = _fileHandle->readUint16LE();
-	_numRooms = _fileHandle->readUint16LE();
-	_numScripts = _fileHandle->readUint16LE();
-	_numSounds = _fileHandle->readUint16LE();
-	_numCharsets = _fileHandle->readUint16LE();
-	_numCostumes = _fileHandle->readUint16LE();
-	_numGlobalObjects = _fileHandle->readUint16LE();
-	_numNewNames = 50;
+		_numVariables = _fileHandle->readUint16LE();
+		_fileHandle->readUint16LE();
+		_numBitVariables = _fileHandle->readUint16LE();
+		_numLocalObjects = _fileHandle->readUint16LE();
+		_numArray = _fileHandle->readUint16LE();
+		_fileHandle->readUint16LE();
+		_numVerbs = _fileHandle->readUint16LE();
+		_numFlObject = _fileHandle->readUint16LE();
+		_numInventory = _fileHandle->readUint16LE();
+		_numRooms = _fileHandle->readUint16LE();
+		_numScripts = _fileHandle->readUint16LE();
+		_numSounds = _fileHandle->readUint16LE();
+		_numCharsets = _fileHandle->readUint16LE();
+		_numCostumes = _fileHandle->readUint16LE();
+		_numGlobalObjects = _fileHandle->readUint16LE();
+		_numNewNames = 50;
 
-	_objectRoomTable = NULL;
-	_numGlobalScripts = 200;
+		_objectRoomTable = NULL;
+		_numGlobalScripts = 200;
 
-	if (_heversion >= 70) {
-		_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
-	}
+		if (_heversion >= 70) {
+			_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
+		}
 
-	if (_heversion <= 70) {
-		_shadowPaletteSize = 256;
-		_shadowPalette = (byte *)calloc(_shadowPaletteSize, 1);
+		if (_heversion <= 70) {
+			_shadowPaletteSize = 256;
+			_shadowPalette = (byte *)calloc(_shadowPaletteSize, 1);
+		}
 	}
 }