From 2cc3bd880f778bbec64f4cf080995547302cac5c Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 29 Jan 2011 18:40:04 +0000
Subject: KYRA: Clean up main menu code in Kyra2/Kyra3.

svn-id: r55620
---
 engines/kyra/kyra_hof.h  | 2 ++
 engines/kyra/kyra_mr.cpp | 6 +++---
 engines/kyra/kyra_mr.h   | 1 +
 engines/kyra/kyra_v2.cpp | 5 -----
 engines/kyra/kyra_v2.h   | 3 ---
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index 576232740b..b862a89dd0 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -293,6 +293,8 @@ protected:
 	void seq_scrollPage(int bottom, int top);
 	void seq_showStarcraftLogo();
 
+	MainMenu *_menu;
+
 	void seq_init();
 	void seq_uninit();
 
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index b91eb42b47..403ac151a5 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -121,6 +121,7 @@ KyraEngine_MR::KyraEngine_MR(OSystem *system, const GameFlags &flags) : KyraEngi
 	_curDlgChapter = _curDlgIndex = _curDlgLang = -1;
 	_isStartupDialog = 0;
 	_stringBuffer = 0;
+	_menu = 0;
 	_menuAnim = 0;
 	_dialogSceneAnim = _dialogSceneScript = -1;
 	memset(&_dialogScriptData, 0, sizeof(_dialogScriptData));
@@ -153,12 +154,11 @@ KyraEngine_MR::KyraEngine_MR(OSystem *system, const GameFlags &flags) : KyraEngi
 }
 
 KyraEngine_MR::~KyraEngine_MR() {
+	uninitMainMenu();
+
 	delete _screen;
 	delete _soundDigital;
 
-	delete _menuAnim;
-	_menuAnim = 0;
-
 	delete[] _itemBuffer1;
 	delete[] _itemBuffer2;
 	delete[] _scoreFile;
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index e6f75742f4..5916dae4b1 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -165,6 +165,7 @@ private:
 	void initMainMenu();
 	void uninitMainMenu();
 
+	MainMenu *_menu;
 	WSAMovie_v2 *_menuAnim;
 
 	// timer
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index 27c89ff9a3..53c57c21cd 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -74,8 +74,6 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags, const Engi
 
 	_pauseStart = 0;
 
-	_menu = 0;
-
 	_lang = 0;
 	Common::Language lang = Common::parseLanguage(ConfMan.get("language"));
 	if (lang == _flags.fanLang && _flags.replacedLang != Common::UNK_LANG)
@@ -120,9 +118,6 @@ KyraEngine_v2::~KyraEngine_v2() {
 
 	_emc->unload(&_sceneScriptData);
 
-	delete _menu;
-	_menu = 0;
-
 	delete[] _animObjects;
 
 	for (Common::Array<const Opcode*>::iterator i = _opcodesAnimation.begin(); i != _opcodesAnimation.end(); ++i)
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h
index 39c9f0875e..084b159ee2 100644
--- a/engines/kyra/kyra_v2.h
+++ b/engines/kyra/kyra_v2.h
@@ -97,9 +97,6 @@ protected:
 	// detection
 	int _lang;
 
-	// MainMenu
-	MainMenu *_menu;
-
 	// Input
 	virtual int inputSceneChange(int x, int y, int unk1, int unk2) = 0;
 
-- 
cgit v1.2.3