aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2003-10-17 15:38:56 +0000
committerMax Horn2003-10-17 15:38:56 +0000
commitaadb0aa237bceded685c32edf12d1eed10a10ede (patch)
tree7e24190de93bebd037b464db67046bc30c498a51 /base
parenta70460833e498620122bd60a1e6708d2a263626a (diff)
downloadscummvm-rg350-aadb0aa237bceded685c32edf12d1eed10a10ede.tar.gz
scummvm-rg350-aadb0aa237bceded685c32edf12d1eed10a10ede.tar.bz2
scummvm-rg350-aadb0aa237bceded685c32edf12d1eed10a10ede.zip
oops, forgot to remove the old Platform enum
svn-id: r10863
Diffstat (limited to 'base')
-rw-r--r--base/gameDetector.cpp4
-rw-r--r--base/gameDetector.h8
2 files changed, 2 insertions, 10 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 38e71aaa4f..ebc8565368 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -177,7 +177,7 @@ GameDetector::GameDetector() {
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 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
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);
diff --git a/base/gameDetector.h b/base/gameDetector.h
index bcc3e45d31..cab41fff0a 100644
--- a/base/gameDetector.h
+++ b/base/gameDetector.h
@@ -38,14 +38,6 @@ enum {
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