[Scummvm-cvs-logs] scummvm master -> 11e327c4e7d41e01378cbdbaf339bbd09881f326
dreammaster
dreammaster at scummvm.org
Sat Aug 15 22:04:45 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:
11e327c4e7 SHERLOCK: RT: Fix erasing background of scaled images with offsets
Commit: 11e327c4e7d41e01378cbdbaf339bbd09881f326
https://github.com/scummvm/scummvm/commit/11e327c4e7d41e01378cbdbaf339bbd09881f326
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-15T16:00:43-04:00
Commit Message:
SHERLOCK: RT: Fix erasing background of scaled images with offsets
Changed paths:
engines/sherlock/screen.cpp
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 7c2b718..4233bca 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -411,7 +411,7 @@ void Screen::flushImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, i
void Screen::flushScaleImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, int16 *yp,
int16 *width, int16 *height, int scaleVal) {
- Common::Point imgPos = pt + frame->_offset;
+ Common::Point imgPos(pt.x + frame->sDrawXOffset(scaleVal), pt.y + frame->sDrawYOffset(scaleVal));
Common::Rect newBounds(imgPos.x, imgPos.y, imgPos.x + frame->sDrawXSize(scaleVal),
imgPos.y + frame->sDrawYSize(scaleVal));
Common::Rect oldBounds(*xp, *yp, *xp + *width, *yp + *height);
More information about the Scummvm-git-logs
mailing list