aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2010-08-08 01:06:44 +0000
committerSven Hesse2010-08-08 01:06:44 +0000
commitf7c23d28e73af5a5fe290512d933e2f233e7debb (patch)
tree3d9a7f4c6bb572a84f43d03ca92275d11064423c
parent4133ef90bc35fe7e627dba8cb82bee3950e2329e (diff)
downloadscummvm-rg350-f7c23d28e73af5a5fe290512d933e2f233e7debb.tar.gz
scummvm-rg350-f7c23d28e73af5a5fe290512d933e2f233e7debb.tar.bz2
scummvm-rg350-f7c23d28e73af5a5fe290512d933e2f233e7debb.zip
GOB: Reactivate the Coh-Cott-workaround
svn-id: r51918
-rw-r--r--engines/gob/videoplayer.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index ae2ef32537..b96e67550c 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -330,10 +330,11 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) {
WRITE_VAR(11, video->decoder->getCurFrame());
+ uint32 ignoreBorder = 0;
if (_woodruffCohCottWorkaround && (properties.startFrame == 31)) {
// WORKAROUND: This frame mistakenly masks Coh Cott, making her vanish
// To prevent that, we'll never draw that part
- // state.left += 50;
+ ignoreBorder = 50;
}
if (surface && primary) {
@@ -367,12 +368,12 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) {
if (video->surface == _vm->_draw->_backSurface) {
for (Common::List<Common::Rect>::const_iterator rect = dirtyRects.begin(); rect != dirtyRects.end(); ++rect)
- _vm->_draw->invalidateRect(rect->left, rect->top, rect->right - 1, rect->bottom - 1);
+ _vm->_draw->invalidateRect(rect->left + ignoreBorder, rect->top, rect->right - 1, rect->bottom - 1);
_vm->_draw->blitInvalidated();
} else if (video->surface == _vm->_draw->_frontSurface) {
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 + ignoreBorder, rect->top, rect->right - 1, rect->bottom - 1);
}