aboutsummaryrefslogtreecommitdiff
path: root/sky/intro.cpp
diff options
context:
space:
mode:
authorRobert Göffringmann2003-07-02 01:46:25 +0000
committerRobert Göffringmann2003-07-02 01:46:25 +0000
commit1b5ea45887d4c853603fd5dedb02b8cf56eeb458 (patch)
treed4451fb5da7b59546ecdd6e32f1f4d2dc71fbe98 /sky/intro.cpp
parent14cfa71ab76024941b0bfd99171045a07a6f018a (diff)
downloadscummvm-rg350-1b5ea45887d4c853603fd5dedb02b8cf56eeb458.tar.gz
scummvm-rg350-1b5ea45887d4c853603fd5dedb02b8cf56eeb458.tar.bz2
scummvm-rg350-1b5ea45887d4c853603fd5dedb02b8cf56eeb458.zip
fixed save/restore grid problems
svn-id: r8703
Diffstat (limited to 'sky/intro.cpp')
-rw-r--r--sky/intro.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/sky/intro.cpp b/sky/intro.cpp
index a71ab84a82..d4fb32ebcc 100644
--- a/sky/intro.cpp
+++ b/sky/intro.cpp
@@ -30,7 +30,7 @@
FREE_IF_NOT_0(_introTextSpace) \
FREE_IF_NOT_0(_introTextSave) \
_mixer->stopAll();
-#define CHECK_ESC if (_key_pressed == 27) { _skyScreen->stopSequence(); REMOVE_INTRO return; }
+#define CHECK_ESC if (_key_pressed == 27) { _skyScreen->stopSequence(); REMOVE_INTRO return false; }
#define WAIT_SEQUENCE while (_skyScreen->sequenceRunning()) { checkCommands(commandPtr); delay(50); CHECK_ESC }
#define INTRO_TEXT_WIDTH 128
@@ -201,7 +201,7 @@ void SkyState::escDelay(uint32 pDelay) {
}
}
-void SkyState::intro(void) {
+bool SkyState::intro(void) {
uint32 *commandPtr = (uint32 *)zeroCommands;
@@ -243,7 +243,7 @@ void SkyState::intro(void) {
if (isCDVersion()) {
- doCDIntro();
+ return doCDIntro();
} else {
_skyDisk->prefetchFile(FN_A_PAL);
_skyDisk->prefetchFile(FN_1A_LOG);
@@ -303,7 +303,7 @@ void SkyState::intro(void) {
delay(40);
if (_key_pressed == 27) {
REMOVE_INTRO;
- return;
+ return false;
}
//non-scrolling frame update
@@ -366,6 +366,7 @@ void SkyState::intro(void) {
commandPtr = (uint32 *)anim6bCommands;
WAIT_SEQUENCE; //6b
}
+ return true;
}
void SkyState::introFrame(uint8 **diffPtr, uint8 **vgaPtr, uint8 *screenData) {