[Scummvm-git-logs] scummvm master -> 4ce71f39225b7bc229f0048cf3bcdf5320dc9a84

[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:
4ce71f3922 MOHAWK: MYST: Fix two Atrus videos playing at the same time in D'ni


Commit: 4ce71f39225b7bc229f0048cf3bcdf5320dc9a84
    https://github.com/scummvm/scummvm/commit/4ce71f39225b7bc229f0048cf3bcdf5320dc9a84
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-04-27T19:29:18+02:00

Commit Message:
MOHAWK: MYST: Fix two Atrus videos playing at the same time in D'ni

In D'ni, after giving the white page to Atrus, or after coming without a
page, too videos of Atrus would play on top of each other after waiting
long enough for the first video to loop.

Fixes #10503.

Changed paths:
    engines/mohawk/myst_stacks/dni.cpp


diff --git a/engines/mohawk/myst_stacks/dni.cpp b/engines/mohawk/myst_stacks/dni.cpp
index 96dba7f..a38b5d3 100644
--- a/engines/mohawk/myst_stacks/dni.cpp
+++ b/engines/mohawk/myst_stacks/dni.cpp
@@ -127,6 +127,7 @@ void Dni::atrusLeft_run() {
 		atrus->moveTo(_videoPos.x, _videoPos.y);
 		atrus->setBounds(Audio::Timestamp(0, 0, 600), Audio::Timestamp(0, 98000, 600));
 
+		_atrusRunning = false;
 		_waitForLoop = true;
 		_loopStart = 73095;
 		_loopEnd = 98000;
@@ -187,6 +188,7 @@ void Dni::atrus_run() {
 			atrus->moveTo(_videoPos.x, _videoPos.y);
 			atrus->setBounds(Audio::Timestamp(0, 0, 600), Audio::Timestamp(0, 46175, 600));
 
+			_atrusRunning = false;
 			_waitForLoop = true;
 			_loopStart = 30656;
 			_loopEnd = 46175;