aboutsummaryrefslogtreecommitdiff
path: root/scumm/resource.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-09-17 05:43:37 +0000
committerTravis Howell2004-09-17 05:43:37 +0000
commitd34da28ed9948fa1d6454e67c4294bf3b546dcd6 (patch)
tree02e42f7315b0d053dcd6387b7238fb81e65d4a39 /scumm/resource.cpp
parent9a65451109bb0764104f1689853bedd09900adf6 (diff)
downloadscummvm-rg350-d34da28ed9948fa1d6454e67c4294bf3b546dcd6.tar.gz
scummvm-rg350-d34da28ed9948fa1d6454e67c4294bf3b546dcd6.tar.bz2
scummvm-rg350-d34da28ed9948fa1d6454e67c4294bf3b546dcd6.zip
nukeArrays still nuking wrong arrays.
Add some more differences in later HE versions. Add HE opcodes changes. svn-id: r15145
Diffstat (limited to 'scumm/resource.cpp')
-rw-r--r--scumm/resource.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index fdae4520b6..821b339b3d 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -2309,7 +2309,7 @@ void ScummEngine::readMAXS(int blockSize) {
_numGlobalObjects = _fileHandle.readUint16LE();
_numImages = _fileHandle.readUint16LE();
_numSprites = _fileHandle.readUint16LE();
- _numLocalScriptOffsets = _fileHandle.readUint16LE();
+ _numLocalScripts = _fileHandle.readUint16LE();
_fileHandle.readUint16LE(); // heap related
_fileHandle.readUint16LE(); // _numPalettes?
_fileHandle.readUint16LE(); // _numSmacker?
@@ -2338,13 +2338,16 @@ void ScummEngine::readMAXS(int blockSize) {
_numGlobalObjects = _fileHandle.readUint16LE();
_numImages = _fileHandle.readUint16LE();
_numSprites = _fileHandle.readUint16LE();
- _numLocalScriptOffsets = _fileHandle.readUint16LE();
+ _numLocalScripts = _fileHandle.readUint16LE();
_fileHandle.readUint16LE(); // heap releated
_numNewNames = 10;
_objectRoomTable = (byte *)calloc(_numGlobalObjects, 1);
_numRoomVariables = 64;
- _numGlobalScripts = 200;
+ if (_gameId == GID_FREDDI4)
+ _numGlobalScripts = 2048;
+ else
+ _numGlobalScripts = 200;
} else if (_heversion >= 70 && blockSize > 38) { // sputm7.2
if (blockSize != 32 + 8)