added (currently completly useless) launcher dialog

svn-id: r5024

3 files changed, 18 insertions, 8 deletions

diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index 5e402eee7a..11bbb2e390 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -336,18 +336,11 @@ bool GameDetector::parseMusicDriver(const char *s) {
 }
 
 
-struct VersionSettings {
-	const char *filename;
-	const char *gamename;
-	byte id, major, middle, minor;
-	uint32 features;
-};
-
 /*
         This is a list of all known SCUMM games. Commented games are not
         supported at this time */
 
-static const VersionSettings version_settings[] = {
+const VersionSettings version_settings[] = {
 	/* Scumm Version 1 */
 //      {"maniac",      "Maniac Mansion (C64)",                         GID_MANIAC64, 1, 0, 0,},
 //      {"zak",         "Zak McKracken and the Alien Mindbenders (C64)", GID_ZAK64, 1, 0, 0,},
diff --git a/common/gameDetector.h b/common/gameDetector.h
index 6393440863..d628b45500 100644
--- a/common/gameDetector.h
+++ b/common/gameDetector.h
@@ -26,6 +26,16 @@
 class OSystem;
 class MidiDriver;
 
+struct VersionSettings {
+	const char *filename;
+	const char *gamename;
+	byte id, major, middle, minor;
+	uint32 features;
+};
+
+extern const VersionSettings version_settings[];
+
+
 class GameDetector {
 public:
 	int detectMain(int argc, char **argv);
diff --git a/common/main.cpp b/common/main.cpp
index 54e24564c9..207269500a 100644
--- a/common/main.cpp
+++ b/common/main.cpp
@@ -25,6 +25,7 @@
 #include "gameDetector.h"
 #include "config-file.h"
 #include "gui/newgui.h"
+#include "gui/launcher.h"
 #include "gui/message.h"
 
 GameDetector detector;
@@ -186,10 +187,16 @@ int main(int argc, char *argv[])
 
 	system->set_palette(dummy_palette, 0, 16);
 
+#if 1
+	extern OSystem *g_system;
+	g_system = system;
+	Dialog *dlg = new LauncherDialog(g_gui);
+#else
 	const char *message = "This dialog is shown before the\n"
 						  "Engine obejct is even created.\n"
 						  "Wow! Ain't we cool?\n";
 	Dialog *dlg = new MessageDialog(g_gui, message);
+#endif
 	dlg->open();
 	g_gui->runLoop();
 	delete dlg;