* Merged object Menu into Parallaction_ns.

* Some preliminary refactoring of ex-menu code.

svn-id: r29354

1 files changed, 9 insertions, 3 deletions

diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 0f4cd12253..49d3915455 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -185,7 +185,6 @@ void waitUntilLeftClick();
 
 class Debugger;
 class Gfx;
-class Menu;
 class SoundMan;
 
 
@@ -667,8 +666,6 @@ public:
 
 
 private:
-	Menu*			_menu;
-
 	void initFonts();
 	void freeFonts();
 
@@ -905,6 +902,15 @@ protected:
 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(move);
 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endscript);
 
+	void		guiStart();
+	void		guiSelectCharacter();
+	void 		guiSplash();
+	void		guiNewGame();
+	uint16		guiChooseLanguage();
+	uint16		guiSelectGame();
+	int			guiGetSelectedBlock(const Common::Point &p, Common::Rect& r);
+
+
 };