thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GOB: Fix videos with the kNoVideo flag

Browse source 
svn-id: r51887
This commit is contained in:
Sven Hesse 2010-08-08 00:52:01 +00:00
parent 66aeee8ddc
commit f61a3c5315
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/gob/videoplayer.cpp
View file

@ -81,6 +81,8 @@ void VideoPlayer::evaluateFlags(Properties &properties) {
properties.x = 0; properties.x = 0;
} else if (properties.flags & kFlagScreenSurface) { } else if (properties.flags & kFlagScreenSurface) {
properties.sprite = 0; properties.sprite = 0;
} else if (properties.flags & kFlagNoVideo) {
properties.sprite = 0;
} else { } else {
properties.sprite = Draw::kBackSurface; 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->invalidateRect(rect->left, rect->top, rect->right - 1, rect->bottom - 1);
_vm->_draw->blitInvalidated(); _vm->_draw->blitInvalidated();
// if (!noRetrace)
_vm->_video->retrace();
} else if (video->surface == _vm->_draw->_frontSurface) { } else if (video->surface == _vm->_draw->_frontSurface) {
for (Common::List<Common::Rect>::const_iterator rect = dirtyRects.begin(); rect != dirtyRects.end(); ++rect) for (Common::List<Common::Rect>::const_iterator rect = dirtyRects.begin(); rect != dirtyRects.end(); ++rect)
_vm->_video->dirtyRectsAdd(rect->left, rect->top, rect->right - 1, rect->bottom - 1); _vm->_video->dirtyRectsAdd(rect->left, rect->top, rect->right - 1, rect->bottom - 1);
// if (!noRetrace)
_vm->_video->retrace();
} }
_vm->_video->retrace();
/* /*
// Subtitle // Subtitle
if (state.flags & Graphics::CoktelDecoder::kStateSpeech) if (state.flags & Graphics::CoktelDecoder::kStateSpeech)