aboutsummaryrefslogtreecommitdiff
path: root/scumm/scummvm.cpp
diff options
context:
space:
mode:
authorMax Horn2002-12-25 21:42:22 +0000
committerMax Horn2002-12-25 21:42:22 +0000
commit748ac8fe378e8abdde3d42fabda36c414e2d1362 (patch)
tree317266bde878f2c3eb2c66aeccc6ffa4f36d1096 /scumm/scummvm.cpp
parentd808e4da1f419ebcf8fb1a7554b09a867ae973ef (diff)
downloadscummvm-rg350-748ac8fe378e8abdde3d42fabda36c414e2d1362.tar.gz
scummvm-rg350-748ac8fe378e8abdde3d42fabda36c414e2d1362.tar.bz2
scummvm-rg350-748ac8fe378e8abdde3d42fabda36c414e2d1362.zip
more cleanup
svn-id: r6149
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r--scumm/scummvm.cpp24
1 files changed, 9 insertions, 15 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 9b2d6b1554..96f6ae426d 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -178,24 +178,18 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
Scumm::~Scumm ()
{
delete [] _actors;
-
- if (_pauseDialog)
- delete _pauseDialog;
- if (_optionsDialog)
- delete _optionsDialog;
- if (_saveLoadDialog)
- delete _saveLoadDialog;
+
+ delete _charset;
+ delete _pauseDialog;
+ delete _optionsDialog;
+ delete _saveLoadDialog;
delete _bundle;
delete _sound;
- if (_imuse)
- delete _imuse;
- if (_imuseDigital)
- delete _imuseDigital;
- if (_existLanguageFile)
- delete _languageBuffer;
- if (_audioNames)
- delete _audioNames;
+ delete _imuse;
+ delete _imuseDigital;
+ delete _languageBuffer;
+ delete _audioNames;
}
void Scumm::scummInit()