aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2013-06-17 21:14:59 +0300
committerFilippos Karapetis2013-06-17 21:14:59 +0300
commitc48a7ee0e327dd75882a505bbb7c1bbdc4af9604 (patch)
tree49b349218614757c5a2c50573b0961e22d24279f
parent4b6907141b82b2f38fab5d13ffab4081a8d2264d (diff)
downloadscummvm-rg350-c48a7ee0e327dd75882a505bbb7c1bbdc4af9604.tar.gz
scummvm-rg350-c48a7ee0e327dd75882a505bbb7c1bbdc4af9604.tar.bz2
scummvm-rg350-c48a7ee0e327dd75882a505bbb7c1bbdc4af9604.zip
SKY: Fix double scene init when the intro is skipped (bug #3512069)
-rw-r--r--engines/sky/sky.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index fd90015aa3..4c47dfafc7 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -187,9 +187,14 @@ Common::Error SkyEngine::go() {
}
if (!shouldQuit()) {
- _skyLogic->initScreen0();
+ // restartGame() takes us to the first scene, without showing the
+ // initial animation where Foster is being chased. initScreen0()
+ // shows the first scene together with that animation. We can't
+ // call both, as they both load the same scene.
if (introSkipped)
_skyControl->restartGame();
+ else
+ _skyLogic->initScreen0();
}
}