[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.10,1.11 gameDetector.h,1.2,1.3 main.cpp,1.9,1.10
Max Horn
fingolfin at users.sourceforge.net
Fri Sep 27 16:28:01 CEST 2002
Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv14625/common
Modified Files:
gameDetector.cpp gameDetector.h main.cpp
Log Message:
added (currently completly useless) launcher dialog
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gameDetector.cpp 26 Sep 2002 12:29:10 -0000 1.10
+++ gameDetector.cpp 27 Sep 2002 23:27:14 -0000 1.11
@@ -336,18 +336,11 @@
}
-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,},
Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gameDetector.h 31 Aug 2002 13:29:09 -0000 1.2
+++ gameDetector.h 27 Sep 2002 23:27:14 -0000 1.3
@@ -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);
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/main.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- main.cpp 27 Sep 2002 13:06:58 -0000 1.9
+++ main.cpp 27 Sep 2002 23:27:14 -0000 1.10
@@ -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 @@
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;
More information about the Scummvm-git-logs
mailing list