diff options
| author | Paul Gilbert | 2014-05-31 21:10:29 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-05-31 21:10:29 -0400 |
| commit | 8f20ebb610b9f6be0a4ef8d417318b3e6f0c965f (patch) | |
| tree | 4cd0dda635a2a3630f9928545b407e2b143865ec /engines/mads/msurface.cpp | |
| parent | 7d82cac910533eb965fa3edc0630db74d0757d8b (diff) | |
| download | scummvm-rg350-8f20ebb610b9f6be0a4ef8d417318b3e6f0c965f.tar.gz scummvm-rg350-8f20ebb610b9f6be0a4ef8d417318b3e6f0c965f.tar.bz2 scummvm-rg350-8f20ebb610b9f6be0a4ef8d417318b3e6f0c965f.zip | |
MADS: Fix positioning and clipping of flipped scaled images
Diffstat (limited to 'engines/mads/msurface.cpp')
| -rw-r--r-- | engines/mads/msurface.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/mads/msurface.cpp b/engines/mads/msurface.cpp index 0108b0b91f..00d85635fa 100644 --- a/engines/mads/msurface.cpp +++ b/engines/mads/msurface.cpp @@ -258,7 +258,7 @@ void MSurface::copyFrom(MSurface *src, const Common::Rect &srcBounds, } void MSurface::copyFrom(MSurface *src, const Common::Point &destPos, int depth, - DepthSurface *depthSurface, int scale, int transparentColor) { + DepthSurface *depthSurface, int scale, bool flipped, int transparentColor) { int destX = destPos.x, destY = destPos.y; int frameWidth = src->getWidth(); int frameHeight = src->getHeight(); @@ -337,12 +337,12 @@ void MSurface::copyFrom(MSurface *src, const Common::Point &destPos, int depth, int destRight = this->getWidth() - 1; int destBottom = this->getHeight() - 1; - bool normalFrame = true; // Check x bounding area int spriteLeft = 0; int spriteWidth = distXCount; int widthAmount = destX + distXCount - 1; + int direction = flipped ? -1 : 1; if (destX < 0) { spriteWidth += destX; @@ -355,7 +355,7 @@ void MSurface::copyFrom(MSurface *src, const Common::Point &destPos, int depth, int spriteRight = spriteLeft + spriteWidth; if (spriteWidth <= 0) return; - if (!normalFrame) { + if (flipped) { destX += distXCount - 1; spriteLeft = -(distXCount - spriteRight); spriteRight = (-spriteLeft + spriteWidth); @@ -380,7 +380,7 @@ void MSurface::copyFrom(MSurface *src, const Common::Point &destPos, int depth, byte *destPixelsP = this->getBasePtr(destX + spriteLeft, destY + spriteTop); - spriteLeft = (spriteLeft * (normalFrame ? 1 : -1)); + spriteLeft = spriteLeft * direction; // Loop through the lines of the sprite for (int yp = 0, sprY = -1; yp < frameHeight; ++yp, srcPixelsP += src->pitch) { @@ -412,7 +412,7 @@ void MSurface::copyFrom(MSurface *src, const Common::Point &destPos, int depth, if ((*srcP != transparentColor) && (depth <= pixelDepth)) *destP = *srcP; - ++destP; + destP += direction; } // Move to the next destination line |