diff options
author | Torbjörn Andersson | 2006-09-30 07:06:55 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2006-09-30 07:06:55 +0000 |
commit | 3c093746bd04f3ca9cf00506546487ee01c90ddf (patch) | |
tree | 50db9bb4980f54fc7c8ef349d139d72552bf8543 /engines/agos | |
parent | 0baff357531f2c6b74a8a4da3282705776e20826 (diff) | |
download | scummvm-rg350-3c093746bd04f3ca9cf00506546487ee01c90ddf.tar.gz scummvm-rg350-3c093746bd04f3ca9cf00506546487ee01c90ddf.tar.bz2 scummvm-rg350-3c093746bd04f3ca9cf00506546487ee01c90ddf.zip |
Re-use FF's _variableArray2[] instead of creating a new one for PP. Free the
variable arrays on exit.
svn-id: r24029
Diffstat (limited to 'engines/agos')
-rw-r--r-- | engines/agos/agos.cpp | 5 | ||||
-rw-r--r-- | engines/agos/agos.h | 1 | ||||
-rw-r--r-- | engines/agos/items.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 06a10705e2..dd60ff40dd 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -331,7 +331,6 @@ AGOSEngine::AGOSEngine(OSystem *syst) _variableArray = 0; _variableArray2 = 0; _variableArrayPtr = 0; - _variableBackupArray = 0; memset(_windowArray, 0, sizeof(_windowArray)); @@ -617,7 +616,6 @@ void AGOSEngine::setupGame() { _variableArray = (int16 *)calloc(_numVars, sizeof(int16)); _variableArray2 = (int16 *)calloc(_numVars, sizeof(int16)); - _variableBackupArray = (int16 *)calloc(_numVars, sizeof(int16)); setupOpcodes(); @@ -659,6 +657,9 @@ AGOSEngine::~AGOSEngine() { free(_backBuf); free(_scaleBuf); + free(_variableArray); + free(_variableArray2); + delete _dummyItem1; delete _dummyItem2; delete _dummyItem3; diff --git a/engines/agos/agos.h b/engines/agos/agos.h index c1543988df..fc4f71360c 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -412,7 +412,6 @@ protected: int16 *_variableArray; int16 *_variableArray2; int16 *_variableArrayPtr; - int16 *_variableBackupArray; WindowBlock *_windowArray[16]; diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp index 60e0f3e35c..afb297e0df 100644 --- a/engines/agos/items.cpp +++ b/engines/agos/items.cpp @@ -2571,7 +2571,7 @@ void AGOSEngine::o4_restoreOopsPosition() { getNextItemPtr(); if (_oopsValid) { for (uint i = 0; i < _numVars; i++) { - _variableArray[i] = _variableBackupArray[i]; + _variableArray[i] = _variableArray2[i]; } // i=FlagData[999]*100+11; // C_PICTURE(4,i); @@ -2644,7 +2644,7 @@ void AGOSEngine::o4_saveOopsPosition() { // if (IsVQueueEmpty() == 0) { _oopsValid = true; for (uint i = 0; i < _numVars; i++) { - _variableBackupArray[i] = _variableArray[i]; + _variableArray2[i] = _variableArray[i]; } // } else // _oopsValid = false; |