Ticket #8328: alt-intro.diff

scummvm/README

@@ -364 +364 @@
   --native-mt32            True Roland MT-32 (disable GM emulation)
   --aspect-ratio           Enable aspect ratio correction
 
-  --floppy-intro           Use floppy version intro for Beneath a Steel Sky CD
+  --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
                            ScummVM disables it by default.
   --demo-mode              Start demo mode of Maniac Mansion (Classic version)
@@ -879 +880 @@
         copy_protection bool     Enable copy protection in SCUMM games ,when
                                  ScummVM disables it by default.
         demo_mode       bool     Start demo in Maniac Mansion (Classic version)
-        floppy_intro    bool     Use floppy version of introduction in Beneath
-                                 a Steel Sky (CD version)
+        alt_intro       bool     Use alternative intro for CD versions of
+                                 Beneath a Steel Sky and Flight of the Amazon
+                                 Queen
 
         boot_param      number   Pass this number to the boot script
         debuglevel      number   Enable debug output. The higher number, the

scummvm/base/gameDetector.cpp

@@ -79 +79 @@
         "  --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 +137 @@
         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 +440 @@
                         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
 

scummvm/doc/05_01.tex

@@ -37 +37 @@
   --native-mt32           &True Roland MT-32 (disable GM emulation)\\
   --aspect-ratio          &Enable aspect ratio correction\\
 \\
-  --floppy-intro          &Use floppy version intro for Beneath a Steel Sky CD\\
+  --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\\
                           &ScummVM disables it by default.\\
   --demo-mode             &Start demo mode of Maniac Mansion (Classic version)\\

scummvm/doc/08.tex

@@ -105 +105 @@
         copy\_protection&bool     Enable copy protection in SCUMM games ,when\\
                         &         ScummVM disables it by default.\\
         demo\_mode      &bool     Start demo in Maniac Mansion (Classic version)\\
-        floppy\_intro   &bool     Use floppy version of introduction in Beneath\\
-                        &         a Steel Sky (CD version)\\
+        alt\_intro      &bool     Use alternative intro for CD versions of \\
+                        &         Beneath a Steel Sky and Flight of the Amazon\\
+                        &         Queen
 \\
         boot\_param     &number   Pass this number to the boot script\\
         debuglevel      &number   Enable debug output. The higher number, the\\

scummvm/sky/sky.cpp

@@ -123 +123 @@
         
         _debugMode = ConfMan.hasKey("debuglevel");
 
-        _floppyIntro = ConfMan.getBool("floppy_intro");
+        _floppyIntro = ConfMan.getBool("alt_intro");
 
         _fastMode = 0;