[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.123.2.1,1.123.2.2

[Eugene Sandulenko]

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

Modified Files:
      Tag: branch-0-8-0
	gameDetector.cpp 
Log Message:
Backport move of talkspeed and copy-protection options out of
#ifndef DISABLE_SCUMM


Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.123.2.1
retrieving revision 1.123.2.2
diff -u -d -r1.123.2.1 -r1.123.2.2
--- gameDetector.cpp	18 Oct 2005 02:11:17 -0000	1.123.2.1
+++ gameDetector.cpp	18 Oct 2005 19:10:15 -0000	1.123.2.2
@@ -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
 
@@ -166,6 +167,7 @@
 	// Miscellaneous
 	ConfMan.registerDefault("joystick_num", -1);
 	ConfMan.registerDefault("confirm_exit", false);
+	ConfMan.registerDefault("disable_sdl_parachute", false);
 #ifdef USE_ALSA
 	ConfMan.registerDefault("alsa_port", "65:0");
 #endif
@@ -501,6 +503,10 @@
 				settings["soundfont"] = option;
 			END_OPTION
 
+			DO_LONG_OPTION_BOOL("disable-sdl-parachute")
+				settings["disable_sdl_parachute"] = boolValue ? "true" : "false";
+			END_OPTION
+
 			DO_LONG_OPTION_BOOL("multi-midi")
 				settings["multi_midi"] = boolValue ? "true" : "false";
 			END_OPTION
@@ -534,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.
@@ -545,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