- some refactoring for Kyra3

- removed unneeded map code in KyraEngine_v3

svn-id: r31488

1 files changed, 2 insertions, 12 deletions

diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h
index f273b7dce1..c0cdaaebbb 100644
--- a/engines/kyra/kyra_v2.h
+++ b/engines/kyra/kyra_v2.h
@@ -202,18 +202,6 @@ public:
 
 	virtual Movie *createWSAMovie();
 protected:
-	// Main menu code, also used for Kyra 3
-	static const char *_mainMenuStrings[];
-
-	virtual void gui_initMainMenu() {}
-	int gui_handleMainMenu();
-	virtual void gui_updateMainMenuAnimation();
-	void gui_drawMainMenu(const char *const *strings, int select);
-	void gui_drawMainBox(int x, int y, int w, int h, int fill);
-	bool gui_mainMenuGetInput();
-
-	void gui_printString(const char *string, int x, int y, int col1, int col2, int flags, ...);
-
 	// intro/outro
 	void seq_playSequences(int startSeq, int endSeq = -1);
 
@@ -328,6 +316,8 @@ protected:
 	void loadItemShapes();
 
 	// run
+	MainMenu *_menu;
+
 	bool _runFlag;
 	bool _showCredits;