aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-10-18 14:37:38 +0000
committerTravis Howell2004-10-18 14:37:38 +0000
commit9531348692f8eb0ad82018fe046db643326a1fa2 (patch)
tree5a255a9ccb4724fef3a0db9ee88f6fcac2113079
parent1922b330adeb553dc7f02fa93f2faa5328f176c3 (diff)
downloadscummvm-rg350-9531348692f8eb0ad82018fe046db643326a1fa2.tar.gz
scummvm-rg350-9531348692f8eb0ad82018fe046db643326a1fa2.tar.bz2
scummvm-rg350-9531348692f8eb0ad82018fe046db643326a1fa2.zip
_images not required.
Free extra HE resources on exit. svn-id: r15605
-rw-r--r--scumm/resource.cpp1
-rw-r--r--scumm/scumm.cpp2
-rw-r--r--scumm/scumm.h1
3 files changed, 2 insertions, 2 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index 5d34591125..54d967c280 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -2445,7 +2445,6 @@ void ScummEngine::allocateArrays() {
_roomVars = (int32 *)calloc(_numRoomVariables, sizeof(int32));
_scummVars = (int32 *)calloc(_numVariables, sizeof(int32));
_bitVars = (byte *)calloc(_numBitVariables >> 3, 1);
- _images = (uint16 *)calloc(_numImages, sizeof(uint16));
if (_features & GF_HUMONGOUS)
_arraySlot = (byte *)calloc(_numArray, 1);
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index cc48f1d9e2..14b4ae8b61 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -978,10 +978,12 @@ ScummEngine::~ScummEngine() {
free(_inventory);
free(_verbs);
free(_objs);
+ free(_roomVars);
free(_scummVars);
free(_bitVars);
free(_newNames);
free(_classData);
+ free(_arraySlot);
free(_roomStrips);
free(_languageIndex);
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 508c35dc79..768c856354 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -463,7 +463,6 @@ protected:
byte *_arraySlot;
uint16 *_inventory;
uint16 *_newNames;
- uint16 *_images;
public:
// VAR is a wrapper around scummVar, which attempts to include additional
// useful information should an illegal var access be detected.