aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/sprites.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-05-31 21:10:29 -0400
committerPaul Gilbert2014-05-31 21:10:29 -0400
commit8f20ebb610b9f6be0a4ef8d417318b3e6f0c965f (patch)
tree4cd0dda635a2a3630f9928545b407e2b143865ec /engines/mads/sprites.cpp
parent7d82cac910533eb965fa3edc0630db74d0757d8b (diff)
downloadscummvm-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/sprites.cpp')
-rw-r--r--engines/mads/sprites.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index b7688ad417..4f5d50db4f 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -317,16 +317,10 @@ void SpriteSlots::drawSprites(MSurface *s) {
assert(frameNumber > 0);
MSprite *sprite = spriteSet.getFrame(frameNumber - 1);
- MSurface *spr = sprite;
- if (flipped) {
- // Create a flipped copy of the sprite temporarily
- spr = sprite->flipHorizontal();
- }
-
if ((slot._scale < 100) && (slot._scale != -1)) {
// Scaled drawing
- s->copyFrom(spr, slot._position, slot._depth, &scene._depthSurface,
- slot._scale, sprite->getTransparencyIndex());
+ s->copyFrom(sprite, slot._position, slot._depth, &scene._depthSurface,
+ slot._scale, flipped, sprite->getTransparencyIndex());
} else {
int xp, yp;
@@ -334,23 +328,29 @@ void SpriteSlots::drawSprites(MSurface *s) {
xp = slot._position.x - scene._posAdjust.x;
yp = slot._position.y - scene._posAdjust.y;
} else {
- xp = slot._position.x - (spr->w / 2) - scene._posAdjust.x;
- yp = slot._position.y - spr->h - scene._posAdjust.y + 1;
+ xp = slot._position.x - (sprite->w / 2) - scene._posAdjust.x;
+ yp = slot._position.y - sprite->h - scene._posAdjust.y + 1;
}
if (slot._depth > 1) {
// Draw the frame with depth processing
- s->copyFrom(spr, Common::Point(xp, yp), slot._depth, &scene._depthSurface,
- -1, sprite->getTransparencyIndex());
+ s->copyFrom(sprite, Common::Point(xp, yp), slot._depth, &scene._depthSurface,
+ -1, flipped, sprite->getTransparencyIndex());
} else {
+ MSurface *spr = sprite;
+ if (flipped) {
+ // Create a flipped copy of the sprite temporarily
+ spr = sprite->flipHorizontal();
+ }
+
// No depth, so simply draw the image
spr->copyTo(s, Common::Point(xp, yp), sprite->getTransparencyIndex());
+
+ // Free sprite if it was a flipped one
+ if (flipped)
+ delete spr;
}
}
-
- // Free sprite if it was a flipped one
- if (flipped)
- delete spr;
}
}