diff options
| author | Sven Hesse | 2010-08-08 00:50:12 +0000 |
|---|---|---|
| committer | Sven Hesse | 2010-08-08 00:50:12 +0000 |
| commit | c812fedb5d47a01daa7a824f1cf56563ff50d5e6 (patch) | |
| tree | e6121e1cf53e7ac5b91c0b40d4f7f5097e9b28dc | |
| parent | f2e5eb78bb3bc223a67e69b42c0013548b26884d (diff) | |
| download | scummvm-rg350-c812fedb5d47a01daa7a824f1cf56563ff50d5e6.tar.gz scummvm-rg350-c812fedb5d47a01daa7a824f1cf56563ff50d5e6.tar.bz2 scummvm-rg350-c812fedb5d47a01daa7a824f1cf56563ff50d5e6.zip | |
GOB: Fix another another with continuing videos
svn-id: r51883
| -rw-r--r-- | engines/gob/videoplayer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index bb9c232444..d0e61c84e3 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -278,7 +278,7 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) { copyPalette(*video, properties.palStart, properties.palEnd); } - if (modifiedPal && (properties.palCmd == 8) && (properties.sprite != Draw::kBackSurface)) + if (modifiedPal && (properties.palCmd == 8) && (video->surface != _vm->_draw->_backSurface)) _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc); if (_needBlit) @@ -305,7 +305,7 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) { _vm->_draw->forceBlit(true); if (modifiedPal && (properties.palCmd == 16)) { - if (properties.sprite == Draw::kBackSurface) + if (video->surface == _vm->_draw->_backSurface) _vm->_draw->forceBlit(); _vm->_palAnim->fade(_vm->_global->_pPaletteDesc, -2, 0); _vm->_draw->_noInvalidated = true; @@ -315,7 +315,7 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) { if (video->decoder->hasPalette() && (properties.palCmd > 1)) { copyPalette(*video, properties.palStart, properties.palEnd); - if (properties.sprite != Draw::kBackSurface) + if (video->surface != _vm->_draw->_backSurface) _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc); else _vm->_draw->_applyPal = true; @@ -323,10 +323,10 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) { const Common::List<Common::Rect> &dirtyRects = video->decoder->getDirtyRects(); - if (modifiedPal && (properties.palCmd == 8) && (properties.sprite == Draw::kBackSurface)) + if (modifiedPal && (properties.palCmd == 8) && (video->surface == _vm->_draw->_backSurface)) _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc); - if (properties.sprite == Draw::kBackSurface) { + 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); @@ -335,7 +335,7 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) { // if (!noRetrace) _vm->_video->retrace(); - } else if (properties.sprite == Draw::kFrontSurface) { + } 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); |