[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.117,1.118 gameDetector.h,1.47,1.48

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv2684/common

Modified Files:
	gameDetector.cpp gameDetector.h 
Log Message:
applied eriktorbjorn's floppy-intro-with-cd-version patch (#765885)

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- gameDetector.cpp	4 Jul 2003 06:54:47 -0000	1.117
+++ gameDetector.cpp	5 Jul 2003 00:57:03 -0000	1.118
@@ -83,6 +83,9 @@
 	"\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 @@
 	_amiga = false;
 	_language = 0;
 
+#ifndef DISABLE_SKY
+	_floppyIntro = false;
+#endif
+
 	_talkSpeed = 60;
 	_debugMode = 0;
 	_debugLevel = 0;
@@ -260,6 +267,10 @@
 			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 @@
 				} 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;
 				}

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gameDetector.h	3 Jul 2003 22:06:13 -0000	1.47
+++ gameDetector.h	5 Jul 2003 00:57:03 -0000	1.48
@@ -120,6 +120,8 @@
 	bool _amiga;
 	int _language;
 
+	bool _floppyIntro;
+
 	uint16 _talkSpeed;
 	uint16 _debugMode;
 	uint16 _debugLevel;