MACVENTURE: Add conditionals to engine destructors

2 files changed, 21 insertions, 7 deletions

diff --git a/engines/macventure/debug.h b/engines/macventure/debug.h
index 8ee9ebe008..c223d01fe4 100644
--- a/engines/macventure/debug.h
+++ b/engines/macventure/debug.h
@@ -31,8 +31,7 @@ enum MacVentureDebugChannel {
    kMVDebugText = 1 << 3,
    kMVDebugScript = 1 << 4,
    kMVDebugSound = 1 << 5,
-   kMVDebugContainer = 1 << 6,
-   kMVDebugTests = 1 << 31
+   kMVDebugContainer = 1 << 6
 };
 } // End namespace MacVenture
 
diff --git a/engines/macventure/macventure.cpp b/engines/macventure/macventure.cpp
index e1d1febd57..37a57ca423 100644
--- a/engines/macventure/macventure.cpp
+++ b/engines/macventure/macventure.cpp
@@ -56,9 +56,17 @@ MacVentureEngine::MacVentureEngine(OSystem *syst, const ADGameDescription *gameD
 
 	_debugger = NULL;
 	_gui = NULL;
+	_scriptEngine = NULL;
+	_filenames = NULL;
+
+	_decodingDirectArticles = NULL;
+	_decodingNamingArticles = NULL;
+	_decodingIndirectArticles = NULL;
+	_textHuffman = NULL;
 
 	_soundManager = NULL;
 
+	_dataBundle = NULL;
 
 	debug("MacVenture::MacVentureEngine()");
 }
@@ -67,10 +75,18 @@ MacVentureEngine::~MacVentureEngine() {
 	debug("MacVenture::~MacVentureEngine()");
 
 	DebugMan.clearAllDebugChannels();
-	delete _rnd;
-	delete _debugger;
-	delete _gui;
-	delete _scriptEngine;
+
+	if (_rnd)
+		delete _rnd;
+
+	if (_debugger)
+		delete _debugger;
+
+	if (_gui)
+		delete _gui;
+
+	if (_scriptEngine)
+		delete _scriptEngine;
 
 	if (_filenames)
 		delete _filenames;
@@ -106,7 +122,6 @@ void MacVentureEngine::initDebugChannels() {
 
 Common::Error MacVentureEngine::run() {
 	debug("MacVenture::MacVentureEngine::init()");
-
 	initGraphics(kScreenWidth, kScreenHeight, true);
 
 	_debugger = new Console(this);