diff options
Diffstat (limited to 'base/gameDetector.cpp')
| -rw-r--r-- | base/gameDetector.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index 1fcb78c030..08bd53281e 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -101,13 +101,13 @@ static const char USAGE_STRING[] = " --alt-intro Use alternative intro for CD versions of Beneath a\n" " Steel Sky and Flight of the Amazon Queen\n" #endif -#ifndef DISABLE_SCUMM " --copy-protection Enable copy protection in SCUMM games, when\n" " ScummVM disables it by default.\n" + " --talkspeed=NUM Set talk speed for games (default: 60)\n" +#ifndef DISABLE_SCUMM " --demo-mode Start demo mode of Maniac Mansion\n" " --tempo=NUM Set music tempo (in percent, 50-200) for SCUMM games\n" " (default: 100)\n" - " --talkspeed=NUM Set talk speed for SCUMM games (default: 60)\n" #endif "\n" "The meaning of boolean long options can be inverted by prefixing them with\n" @@ -152,10 +152,11 @@ GameDetector::GameDetector() { ConfMan.registerDefault("object_labels", true); #endif -#ifndef DISABLE_SCUMM ConfMan.registerDefault("copy_protection", false); - ConfMan.registerDefault("demo_mode", false); ConfMan.registerDefault("talkspeed", 60); + +#ifndef DISABLE_SCUMM + ConfMan.registerDefault("demo_mode", false); ConfMan.registerDefault("tempo", 0); #endif @@ -539,6 +540,14 @@ void GameDetector::parseCommandLine(int argc, char **argv) { settings["savepath"] = option; END_OPTION + DO_LONG_OPTION_INT("talkspeed") + settings["talkspeed"] = option; + END_OPTION + + DO_LONG_OPTION_BOOL("copy-protection") + settings["copy_protection"] = boolValue ? "true" : "false"; + END_OPTION + #ifndef DISABLE_SCUMM DO_LONG_OPTION("tempo") // Use the special value '0' for the base in (int)strtol. @@ -550,14 +559,6 @@ void GameDetector::parseCommandLine(int argc, char **argv) { settings["tempo"] = buf; END_OPTION - DO_LONG_OPTION_INT("talkspeed") - settings["talkspeed"] = option; - END_OPTION - - DO_LONG_OPTION_BOOL("copy-protection") - settings["copy_protection"] = boolValue ? "true" : "false"; - END_OPTION - DO_LONG_OPTION_BOOL("demo-mode") settings["demo_mode"] = boolValue ? "true" : "false"; END_OPTION |