[Scummvm-cvs-logs] CVS: scummvm/common util.cpp,1.32,1.33 util.h,1.36,1.37

Max Horn fingolfin at users.sourceforge.net
Sat Feb 7 09:14:21 CET 2004


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

Modified Files:
	util.cpp util.h 
Log Message:
Make g_platforms global, so that the alauncher can iterate over the list of supported platforms

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- util.cpp	7 Feb 2004 16:00:59 -0000	1.32
+++ util.cpp	7 Feb 2004 17:10:48 -0000	1.33
@@ -182,24 +182,18 @@
 #pragma mark -
 
 
-struct PlatformDescription {
-	const char *code;
-	const char *code2;
-	const char *description;
-	Common::Platform id;
-};
-
-static const PlatformDescription g_platforms[] = {
-	{"pc", "dos", "PC", kPlatformPC},
+const PlatformDescription g_platforms[] = {
 	{"amiga", "ami", "Amiga", kPlatformAmiga},
 	{"atari", "atari-st", "Atari ST", kPlatformAtariST},
-	{"macintosh", "mac", "Macintosh", kPlatformMacintosh},
 
 	// The 'official' spelling seems to be "FM-TOWNS" (e.g. in the Indy4 demo).
 	// However, on the net many variations can be seen, like "FMTOWNS",
 	// "FM TOWNS", "FmTowns", etc.
 	{"fmtowns", "towns", "FM-TOWNS", kPlatformFMTowns},
 
+	{"macintosh", "mac", "Macintosh", kPlatformMacintosh},
+	{"pc", "dos", "PC", kPlatformPC},
+
 	{0, 0, "Default", kPlatformUnknown}
 };
 

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- util.h	7 Feb 2004 16:01:00 -0000	1.36
+++ util.h	7 Feb 2004 17:10:48 -0000	1.37
@@ -146,6 +146,16 @@
 */
 };
 
+struct PlatformDescription {
+	const char *code;
+	const char *code2;
+	const char *description;
+	Common::Platform id;
+};
+
+extern const PlatformDescription g_platforms[];
+
+
 /** Convert a string containing a platform name into a Platform enum value. */
 extern Platform parsePlatform(const String &str);
 extern const char *getPlatformCode(Platform id);





More information about the Scummvm-git-logs mailing list