diff options
Diffstat (limited to 'sky')
| -rw-r--r-- | sky/intro.cpp | 7 | ||||
| -rw-r--r-- | sky/sky.cpp | 2 | ||||
| -rw-r--r-- | sky/sky.h | 2 |
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; } @@ -65,6 +65,8 @@ protected: byte *_introTextSpace; byte *_introTextSave; + bool _floppyIntro; + uint16 _debugMode; uint16 _debugLevel; bool _paintGrid; |