[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.68,1.69

[Travis Howell]

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

Modified Files:
	gameDetector.cpp 
Log Message:

Add Change --floppy-intro to --alt-intro patch (#896311)


Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- gameDetector.cpp	9 Feb 2004 01:27:26 -0000	1.68
+++ gameDetector.cpp	13 Feb 2004 10:51:32 -0000	1.69
@@ -79,8 +79,9 @@
 	"  --native-mt32            True Roland MT-32 (disable GM emulation)\n"
 	"  --aspect-ratio           Enable aspect ratio correction\n"
 	"\n"
-#ifndef DISABLE_SKY
-	"  --floppy-intro           Use floppy version intro for Beneath a Steel Sky CD\n"
+#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
+	"  --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 the original copy protection in SCUMM games\n"
@@ -136,8 +137,8 @@
 	ConfMan.registerDefault("tempo", 0);
 #endif
 
-#ifndef DISABLE_SKY
-	ConfMan.registerDefault("floppy_intro", false);
+#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
+	ConfMan.registerDefault("alt_intro", false);
 #endif
 
 	// Miscellaneous
@@ -439,9 +440,9 @@
 			END_OPTION
 #endif
 
-#ifndef DISABLE_SKY
-			DO_LONG_OPTION_BOOL("floppy-intro")
-				ConfMan.set("floppy_intro", cmdValue, kTransientDomain);
+#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
+			DO_LONG_OPTION_BOOL("alt-intro")
+				ConfMan.set("alt_intro", cmdValue, kTransientDomain);
 			END_OPTION
 #endif