libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-25 04:01:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRIM: Don't override the global ResidualVM menu using the game main menu

Browse Source
This commit is contained in:
Bastien Bouclet 2016-07-21 21:20:30 +02:00
parent 358e578606
commit 43d50064d6
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/engine.h
View File

@ -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.

6
engines/grim/grim.cpp
View File

@ -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);

1
engines/grim/grim.h
View File

@ -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);