applied eriktorbjorn's floppy-intro-with-cd-version patch (#765885)

svn-id: r8753

README

@@ -379,6 +379,7 @@ Command Line Options:
         --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

common/gameDetector.cpp

@@ -83,6 +83,9 @@ static const char USAGE_STRING[] =
 	"\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,6 +166,10 @@ GameDetector::GameDetector() {
 	_amiga = false;
 	_language = 0;
 
+#ifndef DISABLE_SKY
+	_floppyIntro = false;
+#endif
+
 	_talkSpeed = 60;
 	_debugMode = 0;
 	_debugLevel = 0;
@@ -260,6 +267,10 @@ void GameDetector::updateconfig() {
 			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,6 +480,11 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
 				} 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;
 				}

common/gameDetector.h

@@ -120,6 +120,8 @@ public:
 	bool _amiga;
 	int _language;
 
+	bool _floppyIntro;
+
 	uint16 _talkSpeed;
 	uint16 _debugMode;
 	uint16 _debugLevel;

sky/intro.cpp

@@ -205,6 +205,9 @@ bool SkyState::intro(void) {
 
 	uint32 *commandPtr = (uint32 *)zeroCommands;
 
+	if (!isCDVersion())
+		_floppyIntro = true;
+
 	_skyDisk->prefetchFile(60112); // revolution screen
 	_skyDisk->prefetchFile(60113); // revolution palette
 
@@ -214,7 +217,7 @@ bool SkyState::intro(void) {
 	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,7 +245,7 @@ bool SkyState::intro(void) {
 	_skyScreen->paletteFadeUp(60115);
 
 
-	if (isCDVersion()) {
+	if (!_floppyIntro) {
 		return doCDIntro();
 	} else {
 		_skyDisk->prefetchFile(FN_A_PAL);

sky/sky.cpp

@@ -88,6 +88,8 @@ SkyState::SkyState(GameDetector *detector, OSystem *syst)
 	_systemVars.language = detector->_language;
 	_detector = detector;
 
+	_floppyIntro = detector->_floppyIntro;
+
 	_introTextSpace = 0;
 	_introTextSave = 0;
 }

sky/sky.h

@@ -65,6 +65,8 @@ protected:
 	byte *_introTextSpace;
 	byte *_introTextSave;
 
+	bool _floppyIntro;
+
 	uint16 _debugMode;
 	uint16 _debugLevel;
 	bool _paintGrid;