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

[dreammaster]

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:
e28aa3af79 SHERLOCK: Properly handle horizontal flipping in transBlitFrom


Commit: e28aa3af79f3ec1ccf30e4e0f69a564a0bfc9247
    https://github.com/scummvm/scummvm/commit/e28aa3af79f3ec1ccf30e4e0f69a564a0bfc9247
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-06T14:31:19-04:00

Commit Message:
SHERLOCK: Properly handle horizontal flipping in transBlitFrom

Changed paths:
    engines/sherlock/surface.cpp



diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index aba378a..e456d00 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -125,11 +125,11 @@ void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &p
 
 			if (destY >= 0) {
 				// Handle drawing the line
-				const byte *pSrc = (const byte *)src.getBasePtr(0, yCtr);
+				const byte *pSrc = (const byte *)src.getBasePtr(flipped ? src.w - 1 : 0, yCtr);
 				byte *pDest = (byte *)getBasePtr(pt.x, destY);
 				scaleXCtr = 0;
 
-				for (int xCtr = 0, destX = pt.x; xCtr < src.w && destX < this->w(); ++xCtr, ++pSrc) {
+				for (int xCtr = 0, destX = pt.x; xCtr < src.w && destX < this->w(); ++xCtr) {
 					// Handle horizontal scaling
 					scaleXCtr += scaleX;
 
@@ -143,6 +143,8 @@ void Surface::transBlitFrom(const Graphics::Surface &src, const Common::Point &p
 						++pDest;
 						++destX;
 					}
+
+					pSrc = pSrc + (flipped ? -1 : 1);
 				}
 			}