[Scummvm-git-logs] scummvm master -> 2627455a2e693ad01999fe1d1a5042a42eca7011

yuv422 yuv422 at users.noreply.github.com
Thu Aug 6 12:23:11 UTC 2020


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:
2627455a2e DRAGONS: Fixed bug when blending pixels against a transparent background


Commit: 2627455a2e693ad01999fe1d1a5042a42eca7011
    https://github.com/scummvm/scummvm/commit/2627455a2e693ad01999fe1d1a5042a42eca7011
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-08-06T22:20:44+10:00

Commit Message:
DRAGONS: Fixed bug when blending pixels against a transparent background

Changed paths:
    engines/dragons/screen.cpp


diff --git a/engines/dragons/screen.cpp b/engines/dragons/screen.cpp
index ac92fad4bd..91e9a5d58d 100644
--- a/engines/dragons/screen.cpp
+++ b/engines/dragons/screen.cpp
@@ -191,8 +191,10 @@ void Screen::copyRectToSurface8bpp(const void *buffer, const byte* palette, int
 					// only copy opaque pixels
 					WRITE_LE_UINT16(&dst[j * 2], c & ~0x8000);
 				} else {
-					WRITE_LE_UINT16(&dst[j * 2], alpha == NORMAL ? alphaBlendRGB555(c, READ_LE_INT16(&dst[j * 2]), 128) : alphaBlendAdditiveRGB555(c, READ_LE_INT16(&dst[j * 2])));
 					// semi-transparent pixels.
+					WRITE_LE_UINT16(&dst[j * 2], alpha == NORMAL
+						? alphaBlendRGB555(c & 0x7fff, READ_LE_INT16(&dst[j * 2]) & 0x7fff, 128)
+						: alphaBlendAdditiveRGB555(c & 0x7fff, READ_LE_INT16(&dst[j * 2]) & 0x7fff));
 				}
 			}
 		}




More information about the Scummvm-git-logs mailing list