diff options
| author | Sven Hesse | 2008-12-14 03:08:02 +0000 |
|---|---|---|
| committer | Sven Hesse | 2008-12-14 03:08:02 +0000 |
| commit | bbe6ff006e79473a0beeac5a4d88f901c68102fb (patch) | |
| tree | 3a8dd3e71625e40567b9586c3571283b91d67a15 /engines/gob/videoplayer.cpp | |
| parent | 126c5a1dc8ec76b74a33f9b62d553d652a382df4 (diff) | |
| download | scummvm-rg350-bbe6ff006e79473a0beeac5a4d88f901c68102fb.tar.gz scummvm-rg350-bbe6ff006e79473a0beeac5a4d88f901c68102fb.tar.bz2 scummvm-rg350-bbe6ff006e79473a0beeac5a4d88f901c68102fb.zip | |
Music/Video handling fixes/stubs
svn-id: r35351
Diffstat (limited to 'engines/gob/videoplayer.cpp')
| -rw-r--r-- | engines/gob/videoplayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |