aboutsummaryrefslogtreecommitdiff
path: root/scumm/resource_v3.cpp
diff options
context:
space:
mode:
authorMax Horn2005-04-10 00:51:47 +0000
committerMax Horn2005-04-10 00:51:47 +0000
commitcfe85b8618637e5d85dc183b142e0bfffc98434b (patch)
tree654603c6aa198ab403f909bd32d0a027f0356684 /scumm/resource_v3.cpp
parent78f2f279c40b9ff34b2afcd728a15399b823f57f (diff)
downloadscummvm-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_v3.cpp')
-rw-r--r--scumm/resource_v3.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/scumm/resource_v3.cpp b/scumm/resource_v3.cpp
index 94d2888b71..6313393329 100644
--- a/scumm/resource_v3.cpp
+++ b/scumm/resource_v3.cpp
@@ -81,11 +81,7 @@ void ScummEngine_v3old::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();
_fileHandle->readUint16LE(); /* version magic number */
readGlobalObjects();