[Scummvm-cvs-logs] SF.net SVN: scummvm: [21552] scummvm/trunk/base/main.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Apr 2 01:57:02 CEST 2006


Revision: 21552
Author:   fingolfin
Date:     2006-04-02 01:56:11 -0800 (Sun, 02 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21552&view=rev

Log Message:
-----------
Only include gui/launcher.h if it is used; cleanup

Modified Paths:
--------------
    scummvm/trunk/base/main.cpp
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2006-04-02 09:31:06 UTC (rev 21551)
+++ scummvm/trunk/base/main.cpp	2006-04-02 09:56:11 UTC (rev 21552)
@@ -40,16 +40,15 @@
 #include "common/system.h"
 #include "common/timer.h"
 #include "gui/newgui.h"
-#include "gui/launcher.h"
 #include "gui/message.h"
 #include "sound/mididrv.h"
 
-#ifdef _WIN32_WCE
+#if defined(_WIN32_WCE)
 #include "backends/wince/CELauncherDialog.h"
-#endif
-
-#ifdef __DC__
+#elif defined(__DC__)
 #include "backends/dc/DCLauncherDialog.h"
+#else
+#include "gui/launcher.h"
 #endif
 
 #ifdef PALMOS_68K
@@ -363,13 +362,13 @@
 	// Set initial window caption
 	system.setWindowCaption(gScummVMFullVersion);
 
+	// Setup a dummy palette, for the mouse cursor, in case an error
+	// dialog has to be shown. See bug #1097467.
+	setupDummyPalette(system);
+
 	// Unless a game was specified, show the launcher dialog
 	if (detector._targetName.empty())
 		running = launcherDialog(detector, system);
-	else
-		// Setup a dummy palette, for the mouse cursor, in case an error
-		// dialog has to be shown. See bug #1097467.
-		setupDummyPalette(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


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