aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2010-09-03 21:49:22 +0000
committerEugene Sandulenko2010-10-12 23:32:55 +0000
commit99e8337e633e18f31d91e73c4e0a71983124fd77 (patch)
tree7e024cc85a334f14cf624a1fa9df873dd64d7103
parent06bce68860696f67f0a0ac1e9682635081918801 (diff)
downloadscummvm-rg350-99e8337e633e18f31d91e73c4e0a71983124fd77.tar.gz
scummvm-rg350-99e8337e633e18f31d91e73c4e0a71983124fd77.tar.bz2
scummvm-rg350-99e8337e633e18f31d91e73c4e0a71983124fd77.zip
SWORD25: Fix bug in SWF parser
svn-id: r53311
-rw-r--r--engines/sword25/gfx/image/vectorimage.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/sword25/gfx/image/vectorimage.cpp b/engines/sword25/gfx/image/vectorimage.cpp
index 7ec47e8a71..35da539597 100644
--- a/engines/sword25/gfx/image/vectorimage.cpp
+++ b/engines/sword25/gfx/image/vectorimage.cpp
@@ -335,15 +335,15 @@ bool VectorImage::parseDefineShape(uint shapeType, SWFBitStream &bs) {
// Feststellen welche Parameter gesetzt werden
uint32 stateNewStyles = bs.getBits(1);
uint32 stateLineStyle = bs.getBits(1);
- uint32 stateFillStyle1 = bs.getBits(1);
uint32 stateFillStyle0 = bs.getBits(1);
+ uint32 stateFillStyle1 = 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 @@ bool VectorImage::parseDefineShape(uint shapeType, SWFBitStream &bs) {
// 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;