diff options
| author | Matthew Hoops | 2010-05-17 21:59:05 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-05-17 21:59:05 +0000 |
| commit | c7fa1074fbc55e9e519f9c7e08dea9603af22e61 (patch) | |
| tree | 502ce42530df3ea513eebf7096dfc72bf05a3dd7 /engines/sword1/animation.cpp | |
| parent | ea84abf5880f0af2642dd3de08a6d9c6f7f88426 (diff) | |
| download | scummvm-rg350-c7fa1074fbc55e9e519f9c7e08dea9603af22e61.tar.gz scummvm-rg350-c7fa1074fbc55e9e519f9c7e08dea9603af22e61.tar.bz2 scummvm-rg350-c7fa1074fbc55e9e519f9c7e08dea9603af22e61.zip | |
Change VideoDecoder::getCurFrame() to mean the last frame drawn instead of the next frame to draw. This is patch 1 from patch #2963496 (VideoDecoder Rewrite).
svn-id: r49063
Diffstat (limited to 'engines/sword1/animation.cpp')
| -rw-r--r-- | engines/sword1/animation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index 1c1f6dcf4e..221a20ba45 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -179,7 +179,7 @@ void MoviePlayer::play() { void MoviePlayer::performPostProcessing(byte *screen) { if (!_movieTexts.empty()) { - if (_decoder->getCurFrame() == _movieTexts[0]->_startFrame) { + if (_decoder->getCurFrame() + 1 == _movieTexts[0]->_startFrame) { _textMan->makeTextSprite(2, (uint8 *)_movieTexts[0]->_text, 600, LETTER_COL); FrameHeader *frame = _textMan->giveSpriteData(2); @@ -188,7 +188,7 @@ void MoviePlayer::performPostProcessing(byte *screen) { _textX = 320 - _textWidth / 2; _textY = 420 - _textHeight; } - if (_decoder->getCurFrame() == _movieTexts[0]->_endFrame) { + if (_decoder->getCurFrame() + 1 == _movieTexts[0]->_endFrame) { _textMan->releaseText(2, false); delete _movieTexts.remove_at(0); } @@ -256,7 +256,7 @@ int32 DXADecoderWithSound::getAudioLag() { return 0; int32 frameDelay = getFrameDelay(); - int32 videoTime = _videoInfo.currentFrame * frameDelay; + int32 videoTime = (_videoInfo.currentFrame + 1) * frameDelay; int32 audioTime; const Audio::Timestamp ts = _mixer->getElapsedTime(*_bgSoundHandle); |