[Scummvm-cvs-logs] SF.net SVN: scummvm:[49073] scummvm/trunk/graphics/video/flic_decoder.cpp

[salty-horse at users.sourceforge.net]

Revision: 49073
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49073&view=rev
Author:   salty-horse
Date:     2010-05-18 10:01:31 +0000 (Tue, 18 May 2010)

Log Message:
-----------
Fix currentFrame semantics in Flic player

Modified Paths:
--------------
    scummvm/trunk/graphics/video/flic_decoder.cpp

Modified: scummvm/trunk/graphics/video/flic_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/flic_decoder.cpp	2010-05-18 09:24:53 UTC (rev 49072)
+++ scummvm/trunk/graphics/video/flic_decoder.cpp	2010-05-18 10:01:31 UTC (rev 49073)
@@ -252,7 +252,7 @@
 				/* 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 @@
 	}
 
 	// 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 @@
 }
 
 void FlicDecoder::reset() {
-	_videoInfo.currentFrame = 0;
+	_videoInfo.currentFrame = -1;
 	_fileStream->seek(_offsetFrame1);
 }
 


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