[Scummvm-git-logs] scummvm master -> 85a603fdff70d3ea577ca69d2365ebbe67b1a521

[bgK]

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:
85a603fdff MOHAWK: MYST: Don't play the flyby movies when going back to Myst


Commit: 85a603fdff70d3ea577ca69d2365ebbe67b1a521
    https://github.com/scummvm/scummvm/commit/85a603fdff70d3ea577ca69d2365ebbe67b1a521
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-07-25T20:37:27+02:00

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

Changed paths:
    engines/mohawk/myst.cpp
    engines/mohawk/myst.h


diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index bbd72be..d4e15e6 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 3b349c3..007a0c5 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);