thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MOHAWK: MYST: Don't play the flyby movies when going back to Myst

Browse source
This commit is contained in:
Bastien Bouclet 2018-07-25 20:37:27 +02:00
parent 650e26b6ab
commit 85a603fdff
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/mohawk/myst.cpp
View file

@ -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();