From 990eee73f19f80729b96d7586a9dbcc2d4a7a1f3 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Sat, 7 Feb 2009 07:05:08 +0000 Subject: Use Ctrl F5 for global main menu, since any single key would conflict with some games. svn-id: r36240 --- backends/events/default/default-events.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 0c585119d3..be0430b27f 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -436,8 +436,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { _keyRepeatTime = time + kKeyRepeatInitialDelay; #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.flags == Common::KBD_CTRL && event.kbd.keycode == Common::KEYCODE_F5) { if (g_engine && !g_engine->isPaused()) { Common::Event menuEvent; menuEvent.type = Common::EVENT_MAINMENU; -- cgit v1.2.3