[Scummvm-cvs-logs] SF.net SVN: scummvm: [29270] scummvm/trunk/engines/parallaction

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Sat Oct 27 23:29:38 CEST 2007


Revision: 29270
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29270&view=rev
Author:   peres001
Date:     2007-10-27 14:29:38 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
Temporarily force quits when user presses exit key combination. A TODO comment has been added to places where behavior should be changed to allow the engine to exit gracefully.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/dialogue.cpp
    scummvm/trunk/engines/parallaction/parallaction.cpp

Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp	2007-10-27 18:51:37 UTC (rev 29269)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp	2007-10-27 21:29:38 UTC (rev 29270)
@@ -124,8 +124,12 @@
 
 			// FIXME: see comment for updateInput()
 			if (!g_system->getEventManager()->pollEvent(e)) continue;
-			if (e.type == Common::EVENT_QUIT)
+			if (e.type == Common::EVENT_QUIT) {
+				// TODO: don't quit() here, just have caller routines to check
+				// on kEngineQuit and exit gracefully to allow the engine to shut down
+				_engineFlags |= kEngineQuit;
 				g_system->quit();
+			}
 
 			if (e.type != Common::EVENT_KEYDOWN) continue;
 			if (!isdigit(e.kbd.ascii)) continue;

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-10-27 18:51:37 UTC (rev 29269)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-10-27 21:29:38 UTC (rev 29270)
@@ -242,6 +242,8 @@
 			break;
 
 		case Common::EVENT_QUIT:
+			// TODO: don't quit() here, just have caller routines to check
+			// on kEngineQuit and exit gracefully to allow the engine to shut down
 			_engineFlags |= kEngineQuit;
 			g_system->quit();
 			break;
@@ -273,7 +275,10 @@
 			break;
 
 		if (e.type == Common::EVENT_QUIT) {
+			// TODO: don't quit() here, just have caller routines to check
+			// on kEngineQuit and exit gracefully to allow the engine to shut down
 			_engineFlags |= kEngineQuit;
+			g_system->quit();
 			break;
 		}
 


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