[Scummvm-cvs-logs] SF.net SVN: scummvm:[40426] scummvm/trunk/engines/kyra/wsamovie.cpp

[lordhoto at users.sourceforge.net]

Revision: 40426
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40426&view=rev
Author:   lordhoto
Date:     2009-05-10 17:26:46 +0000 (Sun, 10 May 2009)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/wsamovie.cpp

Modified: scummvm/trunk/engines/kyra/wsamovie.cpp
===================================================================
--- scummvm/trunk/engines/kyra/wsamovie.cpp	2009-05-10 17:22:08 UTC (rev 40425)
+++ scummvm/trunk/engines/kyra/wsamovie.cpp	2009-05-10 17:26:46 UTC (rev 40426)
@@ -423,15 +423,15 @@
 		_flags |= WF_NO_FIRST_FRAME;
 	}
 
-	for (int i = 1; i < _numFrames; ++i) {
-		_frameOffsTable[i] = READ_LE_UINT32(wsaData) - frameDataOffs;
+	for (int i = 1; i < _numFrames + 2; ++i) {
+		_frameOffsTable[i] = READ_LE_UINT32(wsaData);
 		wsaData += 4;
 	}
 
-	_frameOffsTable[_numFrames] = READ_LE_UINT32(wsaData);
-	wsaData += 4;
-	_frameOffsTable[_numFrames + 1] = READ_LE_UINT32(wsaData);
-	wsaData += 4;
+	for (int i = 0; i < _numFrames; ++i)
+		_frameOffsTable[_numFrames] -= frameDataOffs;
+
+	// WSA movies without last frame offset need special treatment
 	if (_frameOffsTable[_numFrames + 1])
 		_frameOffsTable[_numFrames] -= frameDataOffs;
 	else


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