[Scummvm-cvs-logs] SF.net SVN: scummvm:[40645] scummvm/trunk/engines/tucker/sequences.cpp

[cyx at users.sourceforge.net]

Revision: 40645
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40645&view=rev
Author:   cyx
Date:     2009-05-17 13:22:33 +0000 (Sun, 17 May 2009)

Log Message:
-----------
fix display of machine.flc (alternative fix would be to use the COGS00xy.PCX files directly and get rid of this second .flc file)

Modified Paths:
--------------
    scummvm/trunk/engines/tucker/sequences.cpp

Modified: scummvm/trunk/engines/tucker/sequences.cpp
===================================================================
--- scummvm/trunk/engines/tucker/sequences.cpp	2009-05-17 12:23:50 UTC (rev 40644)
+++ scummvm/trunk/engines/tucker/sequences.cpp	2009-05-17 13:22:33 UTC (rev 40645)
@@ -918,16 +918,17 @@
 
 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 @@
 	// 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();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.