From 26225b18152faf5c10e119d0484fbe4496a960e7 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Thu, 30 Sep 2004 07:26:21 +0000 Subject: [PATCH] Actually always stored in index svn-id: r15355 --- scumm/resource.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 11b2d1156d8..0f165bada52 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