diff options
| author | Max Horn | 2006-04-02 09:56:11 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-02 09:56:11 +0000 |
| commit | a4d075dad316861755d6f3df390e1e2ab545e582 (patch) | |
| tree | 8e7579cec7c33d4f33b6da87045cfd8ee232d240 | |
| parent | 32de3441111f67d6330526a2d825775e0af19591 (diff) | |
| download | scummvm-rg350-a4d075dad316861755d6f3df390e1e2ab545e582.tar.gz scummvm-rg350-a4d075dad316861755d6f3df390e1e2ab545e582.tar.bz2 scummvm-rg350-a4d075dad316861755d6f3df390e1e2ab545e582.zip | |
Only include gui/launcher.h if it is used; cleanup
svn-id: r21552
| -rw-r--r-- | base/main.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/base/main.cpp b/base/main.cpp index 2a6e34b5ec..0a4a7b670c 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -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 @@ extern "C" int scummvm_main(int argc, char *argv[]) { // 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 |