diff options
| author | Travis Howell | 2009-02-07 07:05:08 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-02-07 07:05:08 +0000 |
| commit | 990eee73f19f80729b96d7586a9dbcc2d4a7a1f3 (patch) | |
| tree | 7acb4bfaf151f08f16e6540db42459b24a012602 | |
| parent | 9f2d6d82ca05c4dfe5e649bcda4586c78cb420f3 (diff) | |
| download | scummvm-rg350-990eee73f19f80729b96d7586a9dbcc2d4a7a1f3.tar.gz scummvm-rg350-990eee73f19f80729b96d7586a9dbcc2d4a7a1f3.tar.bz2 scummvm-rg350-990eee73f19f80729b96d7586a9dbcc2d4a7a1f3.zip | |
Use Ctrl F5 for global main menu, since any single key would conflict with some games.
svn-id: r36240
| -rw-r--r-- | backends/events/default/default-events.cpp | 3 |
1 files changed, 1 insertions, 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; |