aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/myst.cpp
diff options
context:
space:
mode:
authorBastien Bouclet2018-07-25 20:37:27 +0200
committerBastien Bouclet2018-07-25 20:37:27 +0200
commit85a603fdff70d3ea577ca69d2365ebbe67b1a521 (patch)
tree37aedf8882f89a8e1e0e5042e7ce2adf120fe67a /engines/mohawk/myst.cpp
parent650e26b6ab3f6ca0ae685c53fd186ae87b2f84a0 (diff)
downloadscummvm-rg350-85a603fdff70d3ea577ca69d2365ebbe67b1a521.tar.gz
scummvm-rg350-85a603fdff70d3ea577ca69d2365ebbe67b1a521.tar.bz2
scummvm-rg350-85a603fdff70d3ea577ca69d2365ebbe67b1a521.zip
MOHAWK: MYST: Don't play the flyby movies when going back to Myst
Diffstat (limited to 'engines/mohawk/myst.cpp')
-rw-r--r--engines/mohawk/myst.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index bbd72be956..d4e15e6d85 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -256,7 +256,7 @@ void MohawkEngine_Myst::playMovieBlocking(const Common::String &name, MystStack
waitUntilMovieEnds(video);
}
-void MohawkEngine_Myst::playFlybyMovie(MystStack stack, uint16 card) {
+void MohawkEngine_Myst::playFlybyMovie(MystStack stack) {
static const uint16 kMasterpieceOnly = 0xFFFF;
// Play Flyby Entry Movie on Masterpiece Edition.
@@ -608,8 +608,8 @@ void MohawkEngine_Myst::changeToStack(MystStack stackId, uint16 card, uint16 lin
// In Myst ME, play a fullscreen flyby movie, except when loading saves.
// Also play a flyby when first linking to Myst.
if (getFeatures() & GF_ME
- && ((_stack && _stack->getStackId() != kIntroStack) || (stackId == kMystStack && card == 4134))) {
- playFlybyMovie(stackId, card);
+ && ((_stack && _stack->getStackId() == kMystStack) || (stackId == kMystStack && card == 4134))) {
+ playFlybyMovie(stackId);
}
_sound->stopBackground();