[Scummvm-cvs-logs] SF.net SVN: scummvm:[53311] scummvm/trunk/engines/sword25/gfx/image/ vectorimage.cpp

[sev at users.sourceforge.net]

Revision: 53311
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53311&view=rev
Author:   sev
Date:     2010-10-12 23:32:55 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
SWORD25: Fix bug in SWF parser

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp

Modified: scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp	2010-10-12 23:32:32 UTC (rev 53310)
+++ scummvm/trunk/engines/sword25/gfx/image/vectorimage.cpp	2010-10-12 23:32:55 UTC (rev 53311)
@@ -335,15 +335,15 @@
 			// Feststellen welche Parameter gesetzt werden
 			uint32 stateNewStyles = bs.getBits(1);
 			uint32 stateLineStyle = bs.getBits(1);
+			uint32 stateFillStyle0 = bs.getBits(1);
 			uint32 stateFillStyle1 = bs.getBits(1);
-			uint32 stateFillStyle0 = bs.getBits(1);
 			uint32 stateMoveTo = bs.getBits(1);
 
 			// End der Shape-Definition erreicht?
-			if (!stateNewStyles && !stateLineStyle && !stateFillStyle0 && !stateFillStyle1 && !stateMoveTo)
+			if (!stateNewStyles && !stateLineStyle && !stateFillStyle0 && !stateFillStyle1 && !stateMoveTo) {
 				endOfShapeDiscovered = true;
 			// Parameter dekodieren
-			else {
+			} else {
 				int32 moveDeltaX = 0;
 				int32 moveDeltaY = 0;
 				if (stateMoveTo) {
@@ -407,10 +407,10 @@
 
 			// Curved edge
 			if (edgeFlag == 0) {
-				/* int32 ControlDeltaX = */bs.getSignedBits(numBits);
-				/* int32 ControlDeltaY = */bs.getSignedBits(numBits);
-				/* int32 AnchorDeltaX = */bs.getSignedBits(numBits);
-				/* int32 AnchorDeltaY = */bs.getSignedBits(numBits);
+				/* int32 controlDeltaX = */bs.getSignedBits(numBits);
+				/* int32 controlDeltaY = */bs.getSignedBits(numBits);
+				/* int32 anchorDeltaX = */bs.getSignedBits(numBits);
+				/* int32 anchorDeltaY = */bs.getSignedBits(numBits);
 
 #if 0 // TODO
 				double controlX = _elements.back()._paths.last_x() + controlDeltaX;


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