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

[lordhoto at users.sourceforge.net]

Revision: 26786
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26786&view=rev
Author:   lordhoto
Date:     2007-05-08 04:46:27 -0700 (Tue, 08 May 2007)

Log Message:
-----------
Fixed WSA playing regression, introduced while cleaning up. (should fix Floppy and Amiga version)

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

Modified: scummvm/trunk/engines/kyra/wsamovie.cpp
===================================================================
--- scummvm/trunk/engines/kyra/wsamovie.cpp	2007-05-08 10:39:42 UTC (rev 26785)
+++ scummvm/trunk/engines/kyra/wsamovie.cpp	2007-05-08 11:46:27 UTC (rev 26786)
@@ -50,8 +50,10 @@
 	_deltaBufferSize = READ_LE_UINT16(wsaData); wsaData += 2;
 	_offscreenBuffer = NULL;
 	_flags = 0;
-	if (_vm->gameFlags().useAltShapeHeader)
-		flags = READ_LE_UINT16(wsaData); wsaData += 2;
+	if (_vm->gameFlags().useAltShapeHeader) {
+		flags = READ_LE_UINT16(wsaData); 
+		wsaData += 2;
+	}
 	
 	uint32 offsPal = 0;
 	if (flags & 1) {
@@ -86,11 +88,13 @@
 	_frameOffsTable[0] = 0;
 	uint32 frameDataOffs = READ_LE_UINT32(wsaData); wsaData += 4;
 	bool firstFrame = true;
+
 	if (frameDataOffs == 0) {
 		firstFrame = false;
 		frameDataOffs = READ_LE_UINT32(wsaData);
 		_flags |= WF_NO_FIRST_FRAME;
 	}
+
 	for (int i = 1; i < _numFrames + 2; ++i) {
 		_frameOffsTable[i] = READ_LE_UINT32(wsaData) - frameDataOffs;
 		wsaData += 4;


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