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

svn-id: r8753

3 files changed, 9 insertions, 2 deletions

diff --git a/sky/intro.cpp b/sky/intro.cpp
index 44105fcfea..41e5dd81cc 100644
--- a/sky/intro.cpp
+++ b/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);
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 8e03dc1b77..90bceeac53 100644
--- a/sky/sky.cpp
+++ b/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;
 }
diff --git a/sky/sky.h b/sky/sky.h
index 6527d70d68..75a6256eba 100644
--- a/sky/sky.h
+++ b/sky/sky.h
@@ -65,6 +65,8 @@ protected:
 	byte *_introTextSpace;
 	byte *_introTextSave;
 
+	bool _floppyIntro;
+
 	uint16 _debugMode;
 	uint16 _debugLevel;
 	bool _paintGrid;