diff options
author | Sven Hesse | 2010-08-08 00:37:52 +0000 |
---|---|---|
committer | Sven Hesse | 2010-08-08 00:37:52 +0000 |
commit | 9255d2e2179ee6a2cd63b6d8f521e3b9d8543be6 (patch) | |
tree | 66c9a5498e44a5059596053554398bb5ab4bf83d /engines | |
parent | 863872216f1f0e987640633d339ef62e314d15d4 (diff) | |
download | scummvm-rg350-9255d2e2179ee6a2cd63b6d8f521e3b9d8543be6.tar.gz scummvm-rg350-9255d2e2179ee6a2cd63b6d8f521e3b9d8543be6.tar.bz2 scummvm-rg350-9255d2e2179ee6a2cd63b6d8f521e3b9d8543be6.zip |
VIDEO/GOB: Add setSurfaceMemory() to CoktelDecoder
This allows the video player to directly draw onto its own video
memory without having to blit each frame another time.
Will also be needed for proper handling of transparency in Woodruff.
svn-id: r51857
Diffstat (limited to 'engines')
-rw-r--r-- | engines/gob/videoplayer.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index d15c3cc20c..715d5cfb9a 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -136,19 +136,17 @@ int VideoPlayer::openVideo(bool primary, const Common::String &file, Properties if (!_vm->_draw->_spritesArray[properties.sprite]) { properties.sprite = -1; video->surface.reset(); - // video->decoder->setVideoMemory(); + video->decoder->setSurfaceMemory(); } else { video->surface = _vm->_draw->_spritesArray[properties.sprite]; - /* - video->decoder->setVideoMemory(video->surface->getVidMem(), - video->surface->getWidth(), video->surface->getHeight()); - */ + video->decoder->setSurfaceMemory(video->surface->getVidMem(), + video->surface->getWidth(), video->surface->getHeight(), 1); } } else { properties.sprite = -1; video->surface.reset(); - // video->decoder->setVideoMemory(); + video->decoder->setSurfaceMemory(); } if (primary) @@ -270,7 +268,7 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) { WRITE_VAR(11, video->decoder->getCurFrame()); - blitFrame(video->surface, *surface); + // blitFrame(video->surface, *surface); if (_woodruffCohCottWorkaround && (properties.startFrame == 31)) { // WORKAROUND: This frame mistakenly masks Coh Cott, making her vanish |