[Scummvm-cvs-logs] scummvm master -> b07c56923bd50f3d0948f2a4d00672e5f85f637f

dreammaster dreammaster at scummvm.org
Mon Aug 10 00:40:54 CEST 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b07c56923b SHERLOCK: RT: Fix drawing scaled images with image offsets


Commit: b07c56923bd50f3d0948f2a4d00672e5f85f637f
    https://github.com/scummvm/scummvm/commit/b07c56923bd50f3d0948f2a4d00672e5f85f637f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-09T18:40:04-04:00

Commit Message:
SHERLOCK: RT: Fix drawing scaled images with image offsets

Changed paths:
    engines/sherlock/surface.cpp



diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index 9e84e29..98ce73a 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -101,7 +101,8 @@ void Surface::blitFrom(const Surface &src, const Common::Point &pt, const Common
 
 void Surface::transBlitFrom(const ImageFrame &src, const Common::Point &pt,
 		bool flipped, int overrideColor, int scaleVal) {
-	transBlitFrom(src._frame, pt + src._offset, flipped, overrideColor, scaleVal);
+	Common::Point drawPt(pt.x + src.sDrawXOffset(scaleVal), pt.y + src.sDrawYOffset(scaleVal));
+	transBlitFrom(src._frame, drawPt, flipped, overrideColor, scaleVal);
 }
 
 void Surface::transBlitFrom(const Surface &src, const Common::Point &pt,






More information about the Scummvm-git-logs mailing list