[Scummvm-git-logs] scummvm master -> 0a8f47a3ae5d7b69a189a448714620e4cdc9fa4e

[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:
0a8f47a3ae TITANIC: Workaround for incorrect transparency check in getPixel


Commit: 0a8f47a3ae5d7b69a189a448714620e4cdc9fa4e
    https://github.com/scummvm/scummvm/commit/0a8f47a3ae5d7b69a189a448714620e4cdc9fa4e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-04T20:04:49-04:00

Commit Message:
TITANIC: Workaround for incorrect transparency check in getPixel

Changed paths:
    engines/titanic/support/video_surface.cpp



diff --git a/engines/titanic/support/video_surface.cpp b/engines/titanic/support/video_surface.cpp
index f88f053..1991d74 100644
--- a/engines/titanic/support/video_surface.cpp
+++ b/engines/titanic/support/video_surface.cpp
@@ -511,8 +511,10 @@ uint16 OSVideoSurface::getPixel(const Common::Point &pt) {
 
 	if (pt.x >= 0 && pt.y >= 0 && pt.x < getWidth() && pt.y < getHeight()) {
 		if (_transparencySurface) {
+			// WORKAROUND: Original had the setRow _flipVertically check in reverse.
+			// Pretty sure putting it the way is below is the correct way
 			CTransparencySurface transSurface(&_transparencySurface->rawSurface(), _transparencyMode);
-			transSurface.setRow(_flipVertically ? pt.y : getHeight() - pt.y - 1);
+			transSurface.setRow(_flipVertically ? getHeight() - pt.y - 1 : pt.y);
 			transSurface.setCol(pt.x);
 
 			if (transSurface.isPixelTransparent2())