aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorGregory Montoir2009-05-17 13:22:33 +0000
committerGregory Montoir2009-05-17 13:22:33 +0000
commit883e567f5e99e99b73db4dde793eaf37c86e6718 (patch)
tree7725de0c8dc2870adba12c1d2037bb7eb92e606e /engines
parent7ffefa4d869f3cd820e27357b938a66cda84a2be (diff)
downloadscummvm-rg350-883e567f5e99e99b73db4dde793eaf37c86e6718.tar.gz
scummvm-rg350-883e567f5e99e99b73db4dde793eaf37c86e6718.tar.bz2
scummvm-rg350-883e567f5e99e99b73db4dde793eaf37c86e6718.zip
fix display of machine.flc (alternative fix would be to use the COGS00xy.PCX files directly and get rid of this second .flc file)
svn-id: r40645
Diffstat (limited to 'engines')
-rw-r--r--engines/tucker/sequences.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index cf13d04ea6..ad99f731c5 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -918,16 +918,17 @@ void AnimationSequencePlayer::openAnimation(int index, const char *fileName) {
bool AnimationSequencePlayer::decodeNextAnimationFrame(int index) {
bool framesLeft = _flicPlayer[index].decodeNextFrame();
- _flicPlayer[index].copyDirtyRectsToBuffer(_offscreenBuffer, kScreenWidth);
+ if (_seqNum == 19) {
+ _flicPlayer[index].copyFrameToBuffer(_offscreenBuffer, 0, 0, kScreenWidth);
+ } else {
+ _flicPlayer[index].copyDirtyRectsToBuffer(_offscreenBuffer, kScreenWidth);
+ ++_frameCounter;
+ }
if (index == 0) {
if (_flicPlayer[index].paletteChanged()) {
getRGBPalette(index);
}
}
- if (_seqNum != 19) {
- ++_frameCounter;
- }
-
return framesLeft;
}
@@ -954,8 +955,6 @@ void AnimationSequencePlayer::playIntroSeq19_20() {
// The intro credits animation. This uses 2 animations: the foreground one, which
// is the actual intro credits, and the background one, which is an animation of
// cogs, and is being replayed when an intro credit appears
- // FIXME: The background animation is not being played, as a result of the change
- // to the FLIC video player in commit #40638
if (_flicPlayer[0].getCurFrame() >= 116) {
if (!_flicPlayer[1].decodeNextFrame()) {
_flicPlayer[1].reset();