From bbe6ff006e79473a0beeac5a4d88f901c68102fb Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Sun, 14 Dec 2008 03:08:02 +0000 Subject: Music/Video handling fixes/stubs svn-id: r35351 --- engines/gob/videoplayer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/gob/videoplayer.cpp') diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index e719374b5c..403fa12408 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -271,7 +271,7 @@ bool VideoPlayer::primaryOpen(const char *videoFile, int16 x, int16 y, void VideoPlayer::primaryPlay(int16 startFrame, int16 lastFrame, int16 breakKey, uint16 palCmd, int16 palStart, int16 palEnd, - int16 palFrame, int16 endFrame, bool fade, int16 reverseTo) { + int16 palFrame, int16 endFrame, bool fade, int16 reverseTo, bool forceSeek) { if (!_primaryVideo->isOpen()) return; @@ -290,7 +290,7 @@ void VideoPlayer::primaryPlay(int16 startFrame, int16 lastFrame, int16 breakKey, palCmd &= 0x3F; if (video.getCurrentFrame() != startFrame) { - if (video.getFeatures() & CoktelVideo::kFeaturesSound) + if (!forceSeek && (video.getFeatures() & CoktelVideo::kFeaturesSound)) startFrame = video.getCurrentFrame(); else video.seekFrame(startFrame); -- cgit v1.2.3