[Scummvm-cvs-logs] scummvm master -> c48a7ee0e327dd75882a505bbb7c1bbdc4af9604
bluegr
bluegr at gmail.com
Mon Jun 17 20:16:07 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c48a7ee0e3 SKY: Fix double scene init when the intro is skipped (bug #3512069)
Commit: c48a7ee0e327dd75882a505bbb7c1bbdc4af9604
https://github.com/scummvm/scummvm/commit/c48a7ee0e327dd75882a505bbb7c1bbdc4af9604
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-06-17T11:14:59-07:00
Commit Message:
SKY: Fix double scene init when the intro is skipped (bug #3512069)
Changed paths:
engines/sky/sky.cpp
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index fd90015..4c47dfa 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();
}
}
More information about the Scummvm-git-logs
mailing list