diff options
| author | Eugene Sandulenko | 2005-10-18 19:05:22 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-10-18 19:05:22 +0000 |
| commit | be8cd9e69a3d7ad7438cede27e331fdee2e479c4 (patch) | |
| tree | c9f96aad7bd49d0e839bad558ba82e7d08d31b3b | |
| parent | 242cf5d052b8ce6a1f5bf97e1222d26905f782a7 (diff) | |
| download | scummvm-rg350-be8cd9e69a3d7ad7438cede27e331fdee2e479c4.tar.gz scummvm-rg350-be8cd9e69a3d7ad7438cede27e331fdee2e479c4.tar.bz2 scummvm-rg350-be8cd9e69a3d7ad7438cede27e331fdee2e479c4.zip | |
talkspeed and copy-protection aren't SCUMM-specific anymore SAGA uses them
too.
svn-id: r19154
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | base/gameDetector.cpp | 25 | ||||
| -rw-r--r-- | doc/05_01.tex | 4 |
3 files changed, 17 insertions, 16 deletions
@@ -475,12 +475,12 @@ arguments - see the next section. --alt-intro Use alternative intro for CD versions of Beneath a Steel Sky and Flight of the Amazon Queen - --copy-protection Enable copy protection in SCUMM games, when + --copy-protection Enable copy protection in games, when ScummVM disables it by default. --demo-mode Start demo mode of Maniac Mansion (Classic version) --tempo=NUM Set music tempo (in percent, 50-200) for SCUMM games (default: 100) - --talkspeed=NUM Set talk speed for SCUMM games + --talkspeed=NUM Set talk speed for games The meaning of most long options can be inverted by prefixing them with "no-", 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 diff --git a/doc/05_01.tex b/doc/05_01.tex index d084ec3c28..9b40d81115 100644 --- a/doc/05_01.tex +++ b/doc/05_01.tex @@ -47,12 +47,12 @@ Usage: scummvm [OPTIONS]... [GAME]\\ --force-1x-overlay &Make inner GUI 320x200\\ --alt-intro &Use alternative intro for CD versions of Beneath a\\ &Steel Sky and Flight of the Amazon Queen\\ - --copy-protection &Enable copy protection in SCUMM games, when\\ + --copy-protection &Enable copy protection in games, when\\ &ScummVM disables it by default.\\ --demo-mode &Start demo mode of Maniac Mansion (Classic version)\\ --tempo=NUM &Set music tempo (in percent, 50-200) for SCUMM\\ &games (default: 100)\\ - --talkspeed=NUM &Set talk speed for SCUMM games\\ + --talkspeed=NUM &Set talk speed for games\\ \end{tabular} The meaning of most long options can be inverted by prefixing them with "no-", |