aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2010-06-26 11:31:04 +0000
committerPaul Gilbert2010-06-26 11:31:04 +0000
commit8eb206b6b97d172617902f92ea241af89dd22b5f (patch)
treed0dbfd51b8159ba9f636b3d8e12e7401c42504ec /engines
parent18d9f917a0be68327ed3b06da588a5804f42e54f (diff)
downloadscummvm-rg350-8eb206b6b97d172617902f92ea241af89dd22b5f.tar.gz
scummvm-rg350-8eb206b6b97d172617902f92ea241af89dd22b5f.tar.bz2
scummvm-rg350-8eb206b6b97d172617902f92ea241af89dd22b5f.zip
Bugfix to correctly handle transparency when rendering scaled sprites
svn-id: r50314
Diffstat (limited to 'engines')
-rw-r--r--engines/m4/graphics.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/m4/graphics.cpp b/engines/m4/graphics.cpp
index 55c16cb9e7..43df6e1b5f 100644
--- a/engines/m4/graphics.cpp
+++ b/engines/m4/graphics.cpp
@@ -547,7 +547,7 @@ void M4Surface::copyFrom(M4Surface *src, int destX, int destY, Common::Point des
// Not a display pixel
continue;
- if (depth <= *depthP)
+ if ((*srcP != transparentColour) && (depth <= *depthP))
*destP = *srcP;
++destP;