[Scummvm-cvs-logs] scummvm master -> 74be7ed959700ffe0fde025c88c79da8d7f33af7

eriktorbjorn eriktorbjorn at telia.com
Tue Aug 20 08:45:58 CEST 2013


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:
74be7ed959 MOHAWK: Stop videos on stack change


Commit: 74be7ed959700ffe0fde025c88c79da8d7f33af7
    https://github.com/scummvm/scummvm/commit/74be7ed959700ffe0fde025c88c79da8d7f33af7
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-08-19T23:43:18-07:00

Commit Message:
MOHAWK: Stop videos on stack change

Otherwise there may be both a book video and a flyby video playing
at the same time. Maybe it should only stop videos if there really
is a flyby video, but it already stops all sounds and may play a
blocking sound etc., so it makes sense to me to always do it.

Changed paths:
    engines/mohawk/myst.cpp



diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 8140817..975c6c2 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -418,6 +418,7 @@ void MohawkEngine_Myst::changeToStack(uint16 stack, uint16 card, uint16 linkSrcS
 
 	_sound->stopSound();
 	_sound->stopBackgroundMyst();
+	_video->stopVideos();
 	if (linkSrcSound)
 		_sound->playSoundBlocking(linkSrcSound);
 






More information about the Scummvm-git-logs mailing list