[Scummvm-git-logs] scummvm master -> 91a1339e39b8ea76d226a9d89e15199d0704e3cd

[djsrv]

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:
91a1339e39 DIRECTOR: Use matte for arithmetic ink types


Commit: 91a1339e39b8ea76d226a9d89e15199d0704e3cd
    https://github.com/scummvm/scummvm/commit/91a1339e39b8ea76d226a9d89e15199d0704e3cd
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-30T13:29:53-04:00

Commit Message:
DIRECTOR: Use matte for arithmetic ink types

White surrounded by colored pixels needs to be drawn for these ink
types. Fixes https://trello.com/c/WkQSoAZW

Changed paths:
    engines/director/channel.cpp
    engines/director/graphics.cpp


diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index ef36130271..ad5f73a1c8 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -103,6 +103,13 @@ const Graphics::Surface *Channel::getMask(bool forceMatte) {
 		_sprite->_ink == kInkTypeNotTrans ||
 		_sprite->_ink == kInkTypeNotReverse ||
 		_sprite->_ink == kInkTypeNotGhost ||
+		_sprite->_ink == kInkTypeBlend ||
+		_sprite->_ink == kInkTypeAddPin ||
+		_sprite->_ink == kInkTypeAdd ||
+		_sprite->_ink == kInkTypeSubPin ||
+		_sprite->_ink == kInkTypeLight ||
+		_sprite->_ink == kInkTypeSub ||
+		_sprite->_ink == kInkTypeDark ||
 		_sprite->_blend > 0;
 
 	Common::Rect bbox(getBbox());
diff --git a/engines/director/graphics.cpp b/engines/director/graphics.cpp
index 643ff6d57a..4887cb7ce8 100644
--- a/engines/director/graphics.cpp
+++ b/engines/director/graphics.cpp
@@ -247,9 +247,6 @@ void inkDrawPixel(int x, int y, int src, void *data) {
 		break;
 		// Arithmetic ink types
 	default: {
-		if ((uint32)src == p->colorWhite)
-			break;
-
 		byte rSrc, gSrc, bSrc;
 		byte rDst, gDst, bDst;