ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Paul Gilbert
2017-07-11 21:59:21 -04:00
parent ec37d2002c
commit 51ebb01915
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/titanic/support/avi_surface.cpp
+2 -2
View File
@@ -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() {
s->free();
delete s;
} else {
_videoSurface->getRawSurface()->transBlitFrom(frameSurface, _videoSurface->getTransparencyColor());
_videoSurface->getRawSurface()->blitFrom(frameSurface);
}
_videoSurface->unlock();