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

Applied my patch from -devel, which reenables GMM opening via F6.

Browse Source 
svn-id: r34281
This commit is contained in:
Johannes Schickel 2008-09-02 13:27:26 +00:00
parent b235b51e62
commit 34d43e3319
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backends/events/default/default-events.cpp
View File

@ -393,7 +393,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) {
#endif
// Global Main Menu
// FIXME: F6 is not the best trigger, it conflicts with some games!!!
if (event.kbd.keycode == Common::KEYCODE_F6)
if (event.kbd.keycode == Common::KEYCODE_F6) {
if (g_engine && !g_engine->isPaused()) {
Common::Event menuEvent;
menuEvent.type = Common::EVENT_MAINMENU;
@ -409,7 +409,21 @@ bool DefaultEventManager::pollEvent(Common::Event &event) {
//pushEvent(menuEvent);
event = menuEvent;
// FIXME: Since now we do not push another MAINMENU event onto
// our event stack, the GMM would never open, so we have to do
// that here. Of course when the engine would handle MAINMENU
// as an event now and open up the GMM itself it would open the
// menu twice.
if (g_engine && !g_engine->isPaused())
g_engine->mainMenuDialog();
if (_shouldQuit)
event.type = Common::EVENT_QUIT;
else if (_shouldRTL)
event.type = Common::EVENT_RTL;
}
}
break;
case Common::EVENT_KEYUP: