diff options
| -rw-r--r-- | engines/mohawk/myst.cpp | 6 | ||||
| -rw-r--r-- | engines/mohawk/myst.h | 2 |
2 files changed, 4 insertions, 4 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(); diff --git a/engines/mohawk/myst.h b/engines/mohawk/myst.h index 3b349c3d94..007a0c59ef 100644 --- a/engines/mohawk/myst.h +++ b/engines/mohawk/myst.h @@ -171,7 +171,7 @@ public: VideoEntryPtr playMovieFullscreen(const Common::String &name, MystStack stack); VideoEntryPtr findVideo(const Common::String &name, MystStack stack); void playMovieBlocking(const Common::String &name, MystStack stack, uint16 x, uint16 y); - void playFlybyMovie(MystStack stack, uint16 card); + void playFlybyMovie(MystStack stack); void waitUntilMovieEnds(const VideoEntryPtr &video); void playSoundBlocking(uint16 id); |