Ticket #8252: sky-floppy-intro.diff

scummvm/README

@@ -379 +379 @@
         --multi-midi   - enable combination Adlib and native MIDI
         --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
 
 The meaning of long options can be inversed by prefixing them with "no-", e.g.
 --no-aspect-ratio. This is useful if you want to override a setting in the

scummvm/common/gameDetector.cpp

@@ -83 +83 @@
         "\t--multi-midi   - enable combination Adlib and native MIDI\n"
         "\t--native-mt32  - true Roland MT-32 (disable GM emulation)\n"
         "\t--aspect-ratio - enable aspect ratio correction\n"
+#ifndef DISABLE_SKY
+        "\t--floppy-intro - Use floppy version intro for Beneath a Steel Sky CD\n"
+#endif
         "\n"
         "The meaning of long options can be inverted by prefixing them with \"no-\",\n"
         "e.g. \"--no-aspect-ratio\".\n"
@@ -163 +166 @@
         _amiga = false;
         _language = 0;
 
+#ifndef DISABLE_SKY
+        _floppyIntro = false;
+#endif
+
         _talkSpeed = 60;
         _debugMode = 0;
         _debugLevel = 0;
@@ -260 +267 @@
                         exit(-1);
                 }
 
+#ifndef DISABLE_SKY
+        _floppyIntro = g_config->getBool("floppy_intro", _floppyIntro);
+#endif
+
         if ((val = g_config->get("language")))
                 if ((_language = parseLanguage(val)) == -1) {
                         printf("Error in the config file: invalid language.\n");
@@ -469 +480 @@
                                 } else if (!strcmp (s, "aspect-ratio")) {
                                         _aspectRatio = long_option_value;
                                         g_config->setBool ("aspect_ratio", _aspectRatio);
+#ifndef DISABLE_SKY
+                                } else if (!strcmp (s, "floppy-intro")) {
+                                        _floppyIntro = long_option_value;
+                                        g_config->setBool ("floppy_intro", _floppyIntro);
+#endif
                                 } else {
                                         goto ShowHelpAndExit;
                                 }

scummvm/common/gameDetector.h

@@ -120 +120 @@
         bool _amiga;
         int _language;
 
+        bool _floppyIntro;
+
         uint16 _talkSpeed;
         uint16 _debugMode;
         uint16 _debugLevel;

scummvm/sky/intro.cpp

@@ -205 +205 @@
 
         uint32 *commandPtr = (uint32 *)zeroCommands;
 
+        if (!isCDVersion())
+                _floppyIntro = true;
+
         _skyDisk->prefetchFile(60112); // revolution screen
         _skyDisk->prefetchFile(60113); // revolution palette
 
@@ -214 +217 @@
         escDelay(3000); //keep virgin screen up for 3 seconds
         CHECK_ESC
         
-        if (!isCDVersion())
+        if (_floppyIntro)
                 _skyMusic->startMusic(1);
         
         escDelay(3000); //and another 3 seconds.
@@ -242 +245 @@
         _skyScreen->paletteFadeUp(60115);
 
 
-        if (isCDVersion()) {
+        if (!_floppyIntro) {
                 return doCDIntro();
         } else {
                 _skyDisk->prefetchFile(FN_A_PAL);

scummvm/sky/sky.cpp

@@ -71 +71 @@
         _systemVars.language = detector->_language;
         _detector = detector;
 
+        _floppyIntro = detector->_floppyIntro;
+
         _introTextSpace = 0;
         _introTextSave = 0;
 }

scummvm/sky/sky.h

@@ -65 +65 @@
         byte *_introTextSpace;
         byte *_introTextSave;
 
+        bool _floppyIntro;
+
         uint16 _debugMode;
         uint16 _debugLevel;
         bool _paintGrid;