diff options
| author | Johannes Schickel | 2008-04-12 23:59:11 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-04-12 23:59:11 +0000 |
| commit | 991a9779905e6c02e1ce60e447ec552928ec9950 (patch) | |
| tree | a5d4b067563dae5becdf5aba0232c9b03bcb7e0f | |
| parent | 7d86690b29b1cbe6a2a6df0e3a9b5b2eb681719a (diff) | |
| download | scummvm-rg350-991a9779905e6c02e1ce60e447ec552928ec9950.tar.gz scummvm-rg350-991a9779905e6c02e1ce60e447ec552928ec9950.tar.bz2 scummvm-rg350-991a9779905e6c02e1ce60e447ec552928ec9950.zip | |
Cleanup.
svn-id: r31495
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 1 | ||||
| -rw-r--r-- | engines/kyra/sequences_v2.cpp | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index e4beedecd5..78c9573d5a 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -148,6 +148,7 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags) : KyraEngi memset(_cauldronStateTables, 0, sizeof(_cauldronStateTables)); _menuDirectlyToLoad = false; + _menu = 0; } KyraEngine_v2::~KyraEngine_v2() { diff --git a/engines/kyra/sequences_v2.cpp b/engines/kyra/sequences_v2.cpp index d779213a7c..8e089f58be 100644 --- a/engines/kyra/sequences_v2.cpp +++ b/engines/kyra/sequences_v2.cpp @@ -2633,7 +2633,6 @@ void KyraEngine_v2::seq_init() { numShp++; _defaultShapeTable[numShp] = _screen->getPtrToShape(_newShapeFiledata, numShp); } while (_defaultShapeTable[numShp]); - _menu = 0; } else { MainMenu::StaticData data = { { _sequenceStrings[97], _sequenceStrings[96], _sequenceStrings[95], _sequenceStrings[98] }, @@ -2667,10 +2666,8 @@ void KyraEngine_v2::seq_uninit() { memset(&_defaultShapeTable, 0, sizeof(_defaultShapeTable)); - if (_menu) { - delete _menu; - _menu = 0; - } + delete _menu; + _menu = 0; } #pragma mark - |