[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.33,1.34 gameDetector.h,1.13,1.14

Max Horn fingolfin at users.sourceforge.net
Fri Oct 17 08:41:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv30877/base

Modified Files:
	gameDetector.cpp gameDetector.h 
Log Message:
oops, forgot to remove the old Platform enum

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gameDetector.cpp	17 Oct 2003 15:35:45 -0000	1.33
+++ gameDetector.cpp	17 Oct 2003 15:38:55 -0000	1.34
@@ -177,7 +177,7 @@
 	ConfMan.registerDefault("path", "");
 
 //	ConfMan.registerDefault("amiga", false);
-	ConfMan.registerDefault("platform", kPlatformPC);
+	ConfMan.registerDefault("platform", Common::kPlatformPC);
 	ConfMan.registerDefault("language", "en");
 	ConfMan.registerDefault("nosubtitles", false);
 	ConfMan.registerDefault("boot_param", 0);
@@ -388,7 +388,7 @@
 				if (!strncmp(s, "platform=", 9)) {
 					s += 9;
 					int platform = Common::parsePlatform(s);
-					if (platform == kPlatformUnknown)
+					if (platform == Common::kPlatformUnknown)
 						goto ShowHelpAndExit;
 
 					ConfMan.set("platform", platform);

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gameDetector.h	17 Oct 2003 15:35:45 -0000	1.13
+++ gameDetector.h	17 Oct 2003 15:38:56 -0000	1.14
@@ -38,14 +38,6 @@
 	GF_DEFAULT_TO_1X_SCALER = 1 << 31
 };
 
-enum Platform {
-	kPlatformUnknown = -1,
-	kPlatformPC = 0,
-	kPlatformAmiga = 1,
-	kPlatformAtariST = 2,
-	kPlatformMacintosh = 3
-};
-
 enum MidiDriverType {
 	MDT_NONE   = 0,
 	MDT_PCSPK  = 1, // MD_PCSPK and MD_PCJR





More information about the Scummvm-git-logs mailing list