diff options
| -rw-r--r-- | base/gameDetector.cpp | 4 | ||||
| -rw-r--r-- | base/gameDetector.h | 8 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 6 |
3 files changed, 5 insertions, 13 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 diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 682389c2c2..f7e322fbee 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -2643,13 +2643,13 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { } switch (Common::parsePlatform(ConfMan.get("platform"))) { - case kPlatformAmiga: + case Common::kPlatformAmiga: detector->_game.features |= GF_AMIGA; break; - case kPlatformAtariST: + case Common::kPlatformAtariST: detector->_game.features |= GF_ATARI_ST; break; - case kPlatformMacintosh: + case Common::kPlatformMacintosh: detector->_game.features |= GF_MACINTOSH; break; default: |