[Scummvm-git-logs] scummvm master -> d64ea85de66bd73fbeb0ee63ef5da0766dd784cb

dreammaster dreammaster at scummvm.org
Tue Jan 17 04:28:17 CET 2017


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:
d64ea85de6 TITANIC: Fix showing all that pink during Prologue and in Parrot room


Commit: d64ea85de66bd73fbeb0ee63ef5da0766dd784cb
    https://github.com/scummvm/scummvm/commit/d64ea85de66bd73fbeb0ee63ef5da0766dd784cb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-16T22:28:10-05:00

Commit Message:
TITANIC: Fix showing all that pink during Prologue and in Parrot room

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 e240631..b886dc0 100644
--- a/engines/titanic/support/video_surface.cpp
+++ b/engines/titanic/support/video_surface.cpp
@@ -206,6 +206,7 @@ void CVideoSurface::transBlitRect(const Rect &srcRect, const Rect &destRect, CVi
 			Graphics::ManagedSurface *srcSurface = src->_rawSurface;
 			Graphics::ManagedSurface *destSurface = _rawSurface;
 			Graphics::Surface destArea = destSurface->getSubArea(destRect);
+			uint transColor = getTransparencyColor();
 
 			const uint16 *srcPtr = (const uint16 *)srcSurface->getBasePtr(
 				srcRect.left, flipFlag ? srcRect.top : srcRect.bottom - 1);
@@ -223,7 +224,8 @@ void CVideoSurface::transBlitRect(const Rect &srcRect, const Rect &destRect, CVi
 				transSurface.setCol(srcRect.left);
 
 				for (int srcX = srcRect.left; srcX < srcRect.right; ++srcX) {
-					copyPixel(lineDestP, lineSrcP, transSurface.getAlpha() >> 3, srcSurface->format, isAlpha);
+					if (*lineSrcP != transColor)
+						copyPixel(lineDestP, lineSrcP, transSurface.getAlpha() >> 3, srcSurface->format, isAlpha);
 
 					++lineSrcP;
 					++lineDestP;





More information about the Scummvm-git-logs mailing list