diff options
| author | Max Horn | 2005-04-10 00:51:47 +0000 |
|---|---|---|
| committer | Max Horn | 2005-04-10 00:51:47 +0000 |
| commit | cfe85b8618637e5d85dc183b142e0bfffc98434b (patch) | |
| tree | 654603c6aa198ab403f909bd32d0a027f0356684 /scumm/resource_v4.cpp | |
| parent | 78f2f279c40b9ff34b2afcd728a15399b823f57f (diff) | |
| download | scummvm-rg350-cfe85b8618637e5d85dc183b142e0bfffc98434b.tar.gz scummvm-rg350-cfe85b8618637e5d85dc183b142e0bfffc98434b.tar.bz2 scummvm-rg350-cfe85b8618637e5d85dc183b142e0bfffc98434b.zip | |
Don't call allocateArrays from readMAXS, rather call it explicitly after calling readMAXS; init _palManipCounter in the proper place (only needed when restarting); free palManip data on exit
svn-id: r17495
Diffstat (limited to 'scumm/resource_v4.cpp')
| -rw-r--r-- | scumm/resource_v4.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scumm/resource_v4.cpp b/scumm/resource_v4.cpp index d73ac93acf..9efa16573b 100644 --- a/scumm/resource_v4.cpp +++ b/scumm/resource_v4.cpp @@ -71,11 +71,7 @@ void ScummEngine_v4::readIndexFile() { _fileHandle->seek(0, SEEK_SET); readMAXS(0); - - // Jamieson630: palManipulate variable initialization - _palManipCounter = 0; - _palManipPalette = 0; // Will allocate when needed - _palManipIntermediatePal = 0; // Will allocate when needed + allocateArrays(); while (1) { itemsize = _fileHandle->readUint32LE(); @@ -165,7 +161,6 @@ void ScummEngine_v4::readMAXS(int blockSize) { _shadowPaletteSize = 256; _shadowPalette = (byte *) calloc(_shadowPaletteSize, 1); // FIXME - needs to be removed later - allocateArrays(); } void ScummEngine_v4::readGlobalObjects() { |