diff options
author | Jordi Vilalta Prat | 2012-09-05 18:28:42 +0200 |
---|---|---|
committer | Jordi Vilalta Prat | 2012-09-05 18:31:42 +0200 |
commit | f1819d8658bf58b20e968b9309374b6ffbb135e7 (patch) | |
tree | ac628aac9c480809aeb8db2aba12df4766984476 /engines | |
parent | 058b9b9aca066c886ceb4e454a5541be70c27cb6 (diff) | |
download | scummvm-rg350-f1819d8658bf58b20e968b9309374b6ffbb135e7.tar.gz scummvm-rg350-f1819d8658bf58b20e968b9309374b6ffbb135e7.tar.bz2 scummvm-rg350-f1819d8658bf58b20e968b9309374b6ffbb135e7.zip |
GROOVIE: ROQ Info blocks clean the buffers unconditionally.
This fixes some glitches on the Clandestiny trailer.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/groovie/roq.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index 35d7ecf886..72a61fefb2 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -288,19 +288,18 @@ bool ROQPlayer::processBlockInfo(ROQBlockHeader &blockHeader) { // them it should be just fine. _currBuf->create(width, height, Graphics::PixelFormat(3, 0, 0, 0, 0, 0, 0, 0, 0)); _prevBuf->create(width, height, Graphics::PixelFormat(3, 0, 0, 0, 0, 0, 0, 0, 0)); + } - // Clear the buffers with black YUV values - byte *ptr1 = (byte *)_currBuf->getBasePtr(0, 0); - byte *ptr2 = (byte *)_prevBuf->getBasePtr(0, 0); - for (int i = 0; i < width * height; i++) { - *ptr1++ = 0; - *ptr1++ = 128; - *ptr1++ = 128; - *ptr2++ = 0; - *ptr2++ = 128; - *ptr2++ = 128; - } - + // Clear the buffers with black YUV values + byte *ptr1 = (byte *)_currBuf->getBasePtr(0, 0); + byte *ptr2 = (byte *)_prevBuf->getBasePtr(0, 0); + for (int i = 0; i < width * height; i++) { + *ptr1++ = 0; + *ptr1++ = 128; + *ptr1++ = 128; + *ptr2++ = 0; + *ptr2++ = 128; + *ptr2++ = 128; } return true; @@ -405,7 +404,7 @@ void ROQPlayer::processBlockQuadVectorBlock(int baseX, int baseY, int8 Mx, int8 } void ROQPlayer::processBlockQuadVectorBlockSub(int baseX, int baseY, int8 Mx, int8 My) { - debugC(5, kGroovieDebugVideo | kGroovieDebugAll, "Groovie::ROQ: Processing quad vector sub block"); + debugC(6, kGroovieDebugVideo | kGroovieDebugAll, "Groovie::ROQ: Processing quad vector sub block"); uint16 codingType = getCodingType(); switch (codingType) { @@ -433,7 +432,7 @@ void ROQPlayer::processBlockQuadVectorBlockSub(int baseX, int baseY, int8 Mx, in bool ROQPlayer::processBlockStill(ROQBlockHeader &blockHeader) { debugC(5, kGroovieDebugVideo | kGroovieDebugAll, "Groovie::ROQ: Processing still (JPEG) block"); - warning("Groovie::ROQ: JPEG frame (unfinshed)"); + warning("Groovie::ROQ: JPEG frame (unfinished)"); Graphics::JPEGDecoder *jpg = new Graphics::JPEGDecoder(); jpg->loadStream(*_file); |