From 01bfd37919514355513263bb6dfe6d7964b34695 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sun, 7 Feb 2016 13:09:20 +0100 Subject: [PATCH] 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. --- engines/mohawk/myst_areas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/mohawk/myst_areas.cpp b/engines/mohawk/myst_areas.cpp index f8ee56f0228..82213fac2b4 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());