[Scummvm-cvs-logs] SF.net SVN: scummvm: [32813] scummvm/branches/gsoc2008-rtl

cpage88 at users.sourceforge.net cpage88 at users.sourceforge.net
Fri Jun 27 00:03:49 CEST 2008


Revision: 32813
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32813&view=rev
Author:   cpage88
Date:     2008-06-26 15:03:49 -0700 (Thu, 26 Jun 2008)

Log Message:
-----------
Quit or RTL from the main menu now triggers an EVENT_QUIT in DefaultEventManager::pollEvent()

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/backends/events/default/default-events.cpp
    scummvm/branches/gsoc2008-rtl/engines/sky/intro.cpp

Modified: scummvm/branches/gsoc2008-rtl/backends/events/default/default-events.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/events/default/default-events.cpp	2008-06-26 20:43:23 UTC (rev 32812)
+++ scummvm/branches/gsoc2008-rtl/backends/events/default/default-events.cpp	2008-06-26 22:03:49 UTC (rev 32813)
@@ -388,9 +388,12 @@
 			if (event.kbd.keycode == Common::KEYCODE_F11)
 				if (g_engine && !g_engine->isPaused())
 					g_engine->mainMenuDialog();
+			
+			if (!g_engine->_quit)
+				break;
+			else
+				event.type = Common::EVENT_QUIT;
 
-			break;
-
 		case Common::EVENT_KEYUP:
 			_modifierState = event.kbd.flags;
 			if (event.kbd.keycode == _currentKeyDown.keycode) {

Modified: scummvm/branches/gsoc2008-rtl/engines/sky/intro.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sky/intro.cpp	2008-06-26 20:43:23 UTC (rev 32812)
+++ scummvm/branches/gsoc2008-rtl/engines/sky/intro.cpp	2008-06-26 22:03:49 UTC (rev 32813)
@@ -911,8 +911,7 @@
 			if (event.type == Common::EVENT_KEYDOWN) {
 				if (event.kbd.keycode == Common::KEYCODE_ESCAPE)
 					return false;
-			} else if (event.type == Common::EVENT_QUIT || g_engine->_quit) {
-				g_engine->_quit = true;
+			} else if (event.type == Common::EVENT_QUIT) {
 				return false;
 			}
 		}


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




More information about the Scummvm-git-logs mailing list