From be8cd9e69a3d7ad7438cede27e331fdee2e479c4 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 18 Oct 2005 19:05:22 +0000
Subject: talkspeed and copy-protection aren't SCUMM-specific anymore SAGA uses
 them too.

svn-id: r19154
---
 base/gameDetector.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'base')

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
-- 
cgit v1.2.3