[Scummvm-cvs-logs] SF.net SVN: scummvm:[36240] scummvm/trunk/backends/events/default/ default-events.cpp

[Kirben at users.sourceforge.net]

Revision: 36240
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36240&view=rev
Author:   Kirben
Date:     2009-02-07 07:05:08 +0000 (Sat, 07 Feb 2009)

Log Message:
-----------
Use Ctrl F5 for global main menu, since any single key would conflict with some games.

Modified Paths:
--------------
    scummvm/trunk/backends/events/default/default-events.cpp

Modified: scummvm/trunk/backends/events/default/default-events.cpp
===================================================================
--- scummvm/trunk/backends/events/default/default-events.cpp	2009-02-07 07:04:54 UTC (rev 36239)
+++ scummvm/trunk/backends/events/default/default-events.cpp	2009-02-07 07:05:08 UTC (rev 36240)
@@ -436,8 +436,7 @@
 			_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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.