aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-09-30 07:26:21 +0000
committerTravis Howell2004-09-30 07:26:21 +0000
commit26225b18152faf5c10e119d0484fbe4496a960e7 (patch)
treefb271cf16d25d28e6db2ac89fb7a701ac51182bb
parentf9fca592bd09b6cdd89e488e76e9247353462e93 (diff)
downloadscummvm-rg350-26225b18152faf5c10e119d0484fbe4496a960e7.tar.gz
scummvm-rg350-26225b18152faf5c10e119d0484fbe4496a960e7.tar.bz2
scummvm-rg350-26225b18152faf5c10e119d0484fbe4496a960e7.zip
Actually always stored in index
svn-id: r15355
-rw-r--r--scumm/resource.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index 11b2d1156d..0f165bada5 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -2294,7 +2294,7 @@ void ScummEngine::readMAXS(int blockSize) {
} else if (_heversion >= 70 && (blockSize == 44 + 8)) { // C++ based engine
_numVariables = _fileHandle.readUint16LE();
_fileHandle.readUint16LE();
- _fileHandle.readUint16LE();
+ _numRoomVariables = _fileHandle.readUint16LE();
_numLocalObjects = _fileHandle.readUint16LE();
_numArray = _fileHandle.readUint16LE();
_fileHandle.readUint16LE(); // unknown
@@ -2317,13 +2317,12 @@ void ScummEngine::readMAXS(int blockSize) {
_numNewNames = 10;
_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
- _numRoomVariables = 256;
_numGlobalScripts = 2048;
} else if (_heversion >= 70 && (blockSize == 38 + 8)) { // Scummsys.9x
_numVariables = _fileHandle.readUint16LE();
_fileHandle.readUint16LE();
- _fileHandle.readUint16LE();
+ _numRoomVariables = _fileHandle.readUint16LE();
_numLocalObjects = _fileHandle.readUint16LE();
_numArray = _fileHandle.readUint16LE();
_fileHandle.readUint16LE(); // unknown
@@ -2343,7 +2342,6 @@ void ScummEngine::readMAXS(int blockSize) {
_numNewNames = 10;
_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
- _numRoomVariables = 256;
if (_gameId == GID_FREDDI4)
_numGlobalScripts = 2048;
else