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.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.cpp')
| -rw-r--r-- | scumm/resource.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 0eacd914e8..0c3d2c7039 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -410,6 +410,7 @@ void ScummEngine::readIndexFile() { case MKID('MAXS'): readMAXS(itemsize); + allocateArrays(); break; case MKID('DIRN'): @@ -984,8 +985,6 @@ void ScummEngine_v5::readMAXS(int blockSize) { if (_shadowPaletteSize) _shadowPalette = (byte *)calloc(_shadowPaletteSize, 1); - - allocateArrays(); } void ScummEngine_v8::readMAXS(int blockSize) { @@ -1015,8 +1014,6 @@ void ScummEngine_v8::readMAXS(int blockSize) { _shadowPaletteSize = NUM_SHADOW_PALETTE * 256; _shadowPalette = (byte *)calloc(_shadowPaletteSize, 1); - - allocateArrays(); } void ScummEngine_v7::readMAXS(int blockSize) { @@ -1049,8 +1046,6 @@ void ScummEngine_v7::readMAXS(int blockSize) { _shadowPaletteSize = NUM_SHADOW_PALETTE * 256; _shadowPalette = (byte *)calloc(_shadowPaletteSize, 1); - - allocateArrays(); } void ScummEngine_v6::readMAXS(int blockSize) { @@ -1082,8 +1077,6 @@ void ScummEngine_v6::readMAXS(int blockSize) { _shadowPaletteSize = 256; _shadowPalette = (byte *)calloc(_shadowPaletteSize, 1); - - allocateArrays(); } void ScummEngine::readGlobalObjects() { |