From 43d50064d60d5d35018f2bdaee9bd8c6f5027e4a Mon Sep 17 00:00:00 2001
From: Bastien Bouclet <bastien.bouclet@gmail.com>
Date: Thu, 21 Jul 2016 21:20:30 +0200
Subject: [PATCH] GRIM: Don't override the global ResidualVM menu using the
 game main menu

---
 engines/engine.h      | 3 +--
 engines/grim/grim.cpp | 6 ------
 engines/grim/grim.h   | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/engines/engine.h b/engines/engine.h
index 8b00b74d18a..c71a75f05ce 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -298,9 +298,8 @@ public:
 
 	/**
 	 * Run the Global Main Menu Dialog
-	 * added 'virtual' ResidualVM specific
 	 */
-	virtual void openMainMenuDialog();
+	void openMainMenuDialog();
 
 	/**
 	 * Display a warning to the user that the game is not fully supported.
diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index f00370d2e3f..bd38c780d7c 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -1393,12 +1393,6 @@ bool GrimEngine::hasFeature(EngineFeature f) const {
 		(f == kSupportsLoadingDuringRuntime);
 }
 
-void GrimEngine::openMainMenuDialog() {
-	Common::KeyState key(Common::KEYCODE_F1, Common::ASCII_F1);
-	handleControls(Common::EVENT_KEYDOWN, key);
-	handleControls(Common::EVENT_KEYUP, key);
-}
-
 void GrimEngine::pauseEngineIntern(bool pause) {
 	if (g_imuse)
 		g_imuse->pause(pause);
diff --git a/engines/grim/grim.h b/engines/grim/grim.h
index e89568ab3f0..386ade515f0 100644
--- a/engines/grim/grim.h
+++ b/engines/grim/grim.h
@@ -179,7 +179,6 @@ public:
 
 	TextObjectDefaults _sayLineDefaults, _printLineDefaults, _blastTextDefaults;
 
-	virtual void openMainMenuDialog() override;
 	void debugLua(const Common::String &str);
 
 	void setSideTextures(const Common::String &setup);