diff options
author | Gregory Montoir | 2010-06-06 13:40:15 +0000 |
---|---|---|
committer | Gregory Montoir | 2010-06-06 13:40:15 +0000 |
commit | 536e6a9bc308153f36d3eaf509bc0e66bcefc5e7 (patch) | |
tree | a62e8e14eb0ca6c0835a52b0496c0b7acd4771fb | |
parent | 48cfc944216c863ea59160a54739799af21d1768 (diff) | |
download | scummvm-rg350-536e6a9bc308153f36d3eaf509bc0e66bcefc5e7.tar.gz scummvm-rg350-536e6a9bc308153f36d3eaf509bc0e66bcefc5e7.tar.bz2 scummvm-rg350-536e6a9bc308153f36d3eaf509bc0e66bcefc5e7.zip |
fix sequence frame numbering (decrement if getCurFrame now returns the last decoded frame number)
svn-id: r49455
-rw-r--r-- | engines/tucker/sequences.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp index e8e81bde2d..8b0d965987 100644 --- a/engines/tucker/sequences.cpp +++ b/engines/tucker/sequences.cpp @@ -536,9 +536,9 @@ void AnimationSequencePlayer::mainLoop() { } // budttle2.flc is shorter in french version ; start the background music // earlier and skip any sounds effects - if (_seqNum == 19 && _flicPlayer[0].getFrameCount() == 127) { + if (_seqNum == 19 && _flicPlayer[0].getFrameCount() == 126) { _soundSeqDataIndex = 6; - _frameCounter = 79; + _frameCounter = 80; } } (this->*(_updateFunc[_updateFuncIndex].play))(); @@ -806,7 +806,7 @@ void AnimationSequencePlayer::playIntroSeq19_20() { // cogs, and is being replayed when an intro credit appears ::Graphics::Surface *surface = 0; - if (_flicPlayer[0].getCurFrame() >= 117) { + if (_flicPlayer[0].getCurFrame() >= 115) { surface = _flicPlayer[1].decodeNextFrame(); if (_flicPlayer[1].endOfVideo()) _flicPlayer[1].reset(); @@ -883,7 +883,7 @@ void AnimationSequencePlayer::loadIntroSeq3_4() { void AnimationSequencePlayer::playIntroSeq3_4() { if (!_updateScreenPicture) { bool framesLeft = decodeNextAnimationFrame(0); - if (_flicPlayer[0].getCurFrame() == 707) { + if (_flicPlayer[0].getCurFrame() == 705) { initPicPart4(); } if (!framesLeft) { @@ -951,13 +951,13 @@ void AnimationSequencePlayer::loadIntroSeq9_10() { } void AnimationSequencePlayer::playIntroSeq9_10() { - if (_flicPlayer[0].getCurFrame() >= 265 && _flicPlayer[0].getCurFrame() <= 296) { + if (_flicPlayer[0].getCurFrame() >= 263 && _flicPlayer[0].getCurFrame() <= 294) { drawPic1Part10(); _updateScreenWidth += 6; - } else if (_flicPlayer[0].getCurFrame() == 985) { + } else if (_flicPlayer[0].getCurFrame() == 983) { decodeNextAnimationFrame(0); drawPic2Part10(); - } else if (_flicPlayer[0].getCurFrame() >= 989 && _flicPlayer[0].getCurFrame() <= 997) { + } else if (_flicPlayer[0].getCurFrame() >= 987 && _flicPlayer[0].getCurFrame() <= 995) { drawPic1Part10(); _updateScreenWidth -= 25; if (_updateScreenWidth < 0) { |