[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.125,1.126

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32400/base

Modified Files:
	gameDetector.cpp 
Log Message:
talkspeed and copy-protection aren't SCUMM-specific anymore SAGA uses them
too.


Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- gameDetector.cpp	18 Oct 2005 03:52:21 -0000	1.125
+++ gameDetector.cpp	18 Oct 2005 19:05:22 -0000	1.126
@@ -101,13 +101,13 @@
 	"  --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 @@
 	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 @@
 				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 @@
 				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