[Scummvm-git-logs] scummvm master -> 51ebb019154df7adaf23f0a2e00a16bea121d7cd

dreammaster dreammaster at scummvm.org
Wed Jul 12 04:01:21 CEST 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 .

51ebb01915 TITANIC: Fix Titania's nose remaining present after being picked up

Commit: 51ebb019154df7adaf23f0a2e00a16bea121d7cd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-11T21:59:21-04:00

Commit Message:
TITANIC: Fix Titania's nose remaining present after being picked up

Fixing this required reverting the previous fix I'd done for the
Doorbot's 'Cloak Off' animation during the prologue. What the proper
fix for it, seems to be, is that when a video is full 32-bit ARGB,
if it has a second transparency track, then simply ignore the alpha
in the first track, and simply use the RGB values for each pixel

Changed paths:

diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 1662b3d..69c006e 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -321,7 +321,7 @@ void AVISurface::copyMovieFrame(const Graphics::Surface &src, Graphics::ManagedS
 				src.format.colorToARGB(*pSrc, a, r, g, b);
 				assert(a == 0 || a == 0xff);
-				*pDest = (a == 0) ? transPixel : dest.format.RGBToColor(r, g, b);
+				*pDest = (a == 0 && _streamCount == 1) ? transPixel : dest.format.RGBToColor(r, g, b);
@@ -412,7 +412,7 @@ bool AVISurface::renderFrame() {
 			delete s;
 		} else {
-			_videoSurface->getRawSurface()->transBlitFrom(frameSurface, _videoSurface->getTransparencyColor());
+			_videoSurface->getRawSurface()->blitFrom(frameSurface);

More information about the Scummvm-git-logs mailing list