[Scummvm-cvs-logs] scummvm master -> 074bc1f47e0d66ba9c824311fc31cd18224fecb3

[eriktorbjorn]

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:
074bc1f47e SHERLOCK: Fix drawing glitch mentioned in bug #6928


Commit: 074bc1f47e0d66ba9c824311fc31cd18224fecb3
    https://github.com/scummvm/scummvm/commit/074bc1f47e0d66ba9c824311fc31cd18224fecb3
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-10-04T02:01:52+02:00

Commit Message:
SHERLOCK: Fix drawing glitch mentioned in bug #6928

This would happen when drawing an unscaled, flipped sprite that
was clipped because it was partway below the bottom of the
screen. It was incorrectly adjusting the top and bottom again,
even though flipping only affects left and right.

Changed paths:
    engines/sherlock/surface.cpp



diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index d7d5cd9..b7fc763 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -155,8 +155,8 @@ void Surface::transBlitFromUnscaled(const Graphics::Surface &src, const Common::
 		return;
 
 	if (flipped)
-		drawRect = Common::Rect(src.w - drawRect.right, src.h - drawRect.bottom,
-			src.w - drawRect.left, src.h - drawRect.top);
+		drawRect = Common::Rect(src.w - drawRect.right, drawRect.top,
+			src.w - drawRect.left, drawRect.bottom);
 
 	Common::Point destPt(destRect.left, destRect.top);
 	addDirtyRect(Common::Rect(destPt.x, destPt.y, destPt.x + drawRect.width(),