[Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.63,1.64

Max Horn fingolfin at users.sourceforge.net
Sat Dec 25 14:15:01 CET 2004


Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12444/base

Modified Files:
	main.cpp 
Log Message:
Make ESC key work in the launcher

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- main.cpp	25 Dec 2004 19:03:13 -0000	1.63
+++ main.cpp	25 Dec 2004 22:13:44 -0000	1.64
@@ -184,7 +184,7 @@
 
 #endif
 
-static int launcherDialog(GameDetector &detector, OSystem *system) {
+static bool launcherDialog(GameDetector &detector, OSystem *system) {
 
 	system->beginGFXTransaction();
 		// Set the user specified graphics mode (if any).
@@ -232,7 +232,7 @@
 #else
 	GUI::LauncherDialog dlg(detector);
 #endif
-	return dlg.runModal();
+	return (dlg.runModal() != -1);
 }
 
 static int runGame(GameDetector &detector, OSystem *system) {
@@ -377,7 +377,7 @@
 
 	// Unless a game was specified, show the launcher dialog
 	if (detector._targetName.isEmpty())
-		launcherDialog(detector, system);
+		running = launcherDialog(detector, system);
 
 	// FIXME: We're now looping the launcher. This, of course, doesn't
 	// work as well as it should. In theory everything should be destroyed
@@ -403,7 +403,7 @@
 			PluginManager::instance().loadPlugins();
 		}
 
-		launcherDialog(detector, system);
+		running = launcherDialog(detector, system);
 	}
 
 	// ...and quit (the return 0 should never be reached)





More information about the Scummvm-git-logs mailing list