[Scummvm-git-logs] scummvm master -> 32f2fa62cd0e4e9a59d00a944958b54a81d06a51

[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:
32f2fa62cd TITANIC: Fix calculating surface transparency color


Commit: 32f2fa62cd0e4e9a59d00a944958b54a81d06a51
    https://github.com/scummvm/scummvm/commit/32f2fa62cd0e4e9a59d00a944958b54a81d06a51
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-14T00:12:22-05:00

Commit Message:
TITANIC: Fix calculating surface transparency color

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 5261037..fd570e5 100644
--- a/engines/titanic/support/video_surface.cpp
+++ b/engines/titanic/support/video_surface.cpp
@@ -267,10 +267,7 @@ void CVideoSurface::transBlitRect(const Rect &srcRect, const Rect &destRect, CVi
 }
 
 uint CVideoSurface::getTransparencyColor() {
-	uint32 val = -(getPixelDepth() - 2);
-	val &= 0xFFFF8400;
-	val += 0xF81F;
-	return val;
+	return getPixelDepth() == 2 ? 0xf81f : 0x7c1f;
 }
 
 bool CVideoSurface::hasFrame() {