aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Bouclet2016-02-07 13:09:20 +0100
committerBastien Bouclet2016-02-07 15:27:03 +0100
commit01bfd37919514355513263bb6dfe6d7964b34695 (patch)
tree5d354a3a73248d51d0cff1a4a6328c0f4b761c20
parenteb47dcf2c95ee4eb731aa0385403dce7665aec75 (diff)
downloadscummvm-rg350-01bfd37919514355513263bb6dfe6d7964b34695.tar.gz
scummvm-rg350-01bfd37919514355513263bb6dfe6d7964b34695.tar.bz2
scummvm-rg350-01bfd37919514355513263bb6dfe6d7964b34695.zip
MOHAWK: Adjust MystAreaVideo::playAreaVideo for the refactored VideoManager
The refactoring in 7e6c8be7db2449c1f793b6fb01af5613282e7f27 changed the behavior of VideoManager::playMovie to start stopped movies. The refactoring in 9665efa39a4df000eb695329a9b81c1657f4dc10 changed the behavior of MystAreaVideo::playAreaVideo to set the position and looping flag for already playing movies. This commit hopefuly reverts to the previous behavior for videos already loaded in VideoManager.
-rw-r--r--engines/mohawk/myst_areas.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/mohawk/myst_areas.cpp b/engines/mohawk/myst_areas.cpp
index f8ee56f022..82213fac2b 100644
--- a/engines/mohawk/myst_areas.cpp
+++ b/engines/mohawk/myst_areas.cpp
@@ -225,7 +225,7 @@ VideoHandle MystAreaVideo::playMovie() {
VideoHandle handle = _vm->_video->findVideoHandle(_videoFile);
// If the video is not running, play it
- if (!handle || handle->endOfVideo()) {
+ if (!handle) {
handle = _vm->_video->playMovie(_videoFile);
if (!handle)
error("Failed to open '%s'", _videoFile.c_str());