diff options
| author | Ori Avtalion | 2010-05-18 10:01:31 +0000 |
|---|---|---|
| committer | Ori Avtalion | 2010-05-18 10:01:31 +0000 |
| commit | 7ab8f6e25bb4904140116c4a484b5a23c44d6bf5 (patch) | |
| tree | 848db94205146c0701dc736e559394bf0a43265e /graphics/video | |
| parent | 16afdc372e156ac5ff85748c1a29bc833e201e75 (diff) | |
| download | scummvm-rg350-7ab8f6e25bb4904140116c4a484b5a23c44d6bf5.tar.gz scummvm-rg350-7ab8f6e25bb4904140116c4a484b5a23c44d6bf5.tar.bz2 scummvm-rg350-7ab8f6e25bb4904140116c4a484b5a23c44d6bf5.zip | |
Fix currentFrame semantics in Flic player
svn-id: r49073
Diffstat (limited to 'graphics/video')
| -rw-r--r-- | graphics/video/flic_decoder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/graphics/video/flic_decoder.cpp b/graphics/video/flic_decoder.cpp index 9dae1171ac..14d062562f 100644 --- a/graphics/video/flic_decoder.cpp +++ b/graphics/video/flic_decoder.cpp @@ -252,7 +252,7 @@ bool FlicDecoder::decodeNextFrame() { /* PSTAMP - skip for now */ break; default: - error("FlicDecoder::decodeFrame(): unknown subchunk type (type = 0x%02X)", frameType); + error("FlicDecoder::decodeNextFrame(): unknown subchunk type (type = 0x%02X)", frameType); break; } @@ -261,8 +261,8 @@ bool FlicDecoder::decodeNextFrame() { } // If we just processed the ring frame, set the next frame - if (_videoInfo.currentFrame == (int32)_videoInfo.frameCount + 1) { - _videoInfo.currentFrame = 1; + if (_videoInfo.currentFrame == (int32)_videoInfo.frameCount) { + _videoInfo.currentFrame = 0; _fileStream->seek(_offsetFrame2); } @@ -270,7 +270,7 @@ bool FlicDecoder::decodeNextFrame() { } void FlicDecoder::reset() { - _videoInfo.currentFrame = 0; + _videoInfo.currentFrame = -1; _fileStream->seek(_offsetFrame1); } |