From f61a3c53151ffd9d0a7c59a5d4f7226d08ff404c Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Sun, 8 Aug 2010 00:52:01 +0000 Subject: [PATCH] GOB: Fix videos with the kNoVideo flag svn-id: r51887 --- engines/gob/videoplayer.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index 35f423d2f48..a2450e18478 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -81,6 +81,8 @@ void VideoPlayer::evaluateFlags(Properties &properties) { properties.x = 0; } else if (properties.flags & kFlagScreenSurface) { properties.sprite = 0; + } else if (properties.flags & kFlagNoVideo) { + properties.sprite = 0; } else { properties.sprite = Draw::kBackSurface; } @@ -341,17 +343,14 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) { _vm->_draw->invalidateRect(rect->left, rect->top, rect->right - 1, rect->bottom - 1); _vm->_draw->blitInvalidated(); - // if (!noRetrace) - _vm->_video->retrace(); - } else if (video->surface == _vm->_draw->_frontSurface) { for (Common::List::const_iterator rect = dirtyRects.begin(); rect != dirtyRects.end(); ++rect) _vm->_video->dirtyRectsAdd(rect->left, rect->top, rect->right - 1, rect->bottom - 1); - // if (!noRetrace) - _vm->_video->retrace(); } + _vm->_video->retrace(); + /* // Subtitle if (state.flags & Graphics::CoktelDecoder::kStateSpeech)