thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oops, forgot to remove the old Platform enum

Browse source 
svn-id: r10863
This commit is contained in:
Max Horn 2003-10-17 15:38:56 +00:00
parent a70460833e
commit aadb0aa237
3 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
base/gameDetector.cpp
View file

@ -177,7 +177,7 @@ GameDetector::GameDetector() {
ConfMan.registerDefault("path", ""); ConfMan.registerDefault("path", "");
// ConfMan.registerDefault("amiga", false); // ConfMan.registerDefault("amiga", false);
ConfMan.registerDefault("platform", kPlatformPC); ConfMan.registerDefault("platform", Common::kPlatformPC);
ConfMan.registerDefault("language", "en"); ConfMan.registerDefault("language", "en");
ConfMan.registerDefault("nosubtitles", false); ConfMan.registerDefault("nosubtitles", false);
ConfMan.registerDefault("boot_param", 0); ConfMan.registerDefault("boot_param", 0);
@ -388,7 +388,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
if (!strncmp(s, "platform=", 9)) { if (!strncmp(s, "platform=", 9)) {
s += 9; s += 9;
int platform = Common::parsePlatform(s); int platform = Common::parsePlatform(s);
if (platform == kPlatformUnknown) if (platform == Common::kPlatformUnknown)
goto ShowHelpAndExit; goto ShowHelpAndExit;
ConfMan.set("platform", platform); ConfMan.set("platform", platform);

8
base/gameDetector.h
View file

@ -38,14 +38,6 @@ enum {
GF_DEFAULT_TO_1X_SCALER = 1 << 31 GF_DEFAULT_TO_1X_SCALER = 1 << 31
}; };
enum Platform {
kPlatformUnknown = -1,
kPlatformPC = 0,
kPlatformAmiga = 1,
kPlatformAtariST = 2,
kPlatformMacintosh = 3
};
enum MidiDriverType { enum MidiDriverType {
MDT_NONE = 0, MDT_NONE = 0,
MDT_PCSPK = 1, // MD_PCSPK and MD_PCJR MDT_PCSPK = 1, // MD_PCSPK and MD_PCJR

6
scumm/scummvm.cpp
View file

@ -2643,13 +2643,13 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
} }
switch (Common::parsePlatform(ConfMan.get("platform"))) { switch (Common::parsePlatform(ConfMan.get("platform"))) {
case kPlatformAmiga: case Common::kPlatformAmiga:
detector->_game.features |= GF_AMIGA; detector->_game.features |= GF_AMIGA;
break; break;
case kPlatformAtariST: case Common::kPlatformAtariST:
detector->_game.features |= GF_ATARI_ST; detector->_game.features |= GF_ATARI_ST;
break; break;
case kPlatformMacintosh: case Common::kPlatformMacintosh:
detector->_game.features |= GF_MACINTOSH; detector->_game.features |= GF_MACINTOSH;
break; break;
default: default: