[Scummvm-git-logs] scummvm master -> 28fdbed20d77fc7b163e0c6cc674cffef46490f8

[rvanlaar]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
274cfacbb9 DIRECTOR: Fix rendering with Bkgnd Transparent ink
28fdbed20d DIRECTOR: simplify setting applyColor to false


Commit: 274cfacbb940e4ad6ddc4ba398f9835eee9a0056
    https://github.com/scummvm/scummvm/commit/274cfacbb940e4ad6ddc4ba398f9835eee9a0056
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2021-08-25T11:27:08+02:00

Commit Message:
DIRECTOR: Fix rendering with Bkgnd Transparent ink

Scores with the Bkgnd Transparent ink set were rendered black.

This hapened on with cards on the poker table in Majestic (win).

Changed paths:
    engines/director/graphics.cpp


diff --git a/engines/director/graphics.cpp b/engines/director/graphics.cpp
index f5100e4a7a..beaaba2fae 100644
--- a/engines/director/graphics.cpp
+++ b/engines/director/graphics.cpp
@@ -313,8 +313,7 @@ void DirectorPlotData::setApplyColor() {
 	}
 
 	if (backColor != colorWhite) {
-		if (ink != kInkTypeTransparent &&
-				ink != kInkTypeNotTrans)
+		if (ink != kInkTypeTransparent && ink != kInkTypeNotTrans && ink != kInkTypeBackgndTrans)
 			applyColor = true;
 	}
 }


Commit: 28fdbed20d77fc7b163e0c6cc674cffef46490f8
    https://github.com/scummvm/scummvm/commit/28fdbed20d77fc7b163e0c6cc674cffef46490f8
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2021-08-25T11:27:08+02:00

Commit Message:
DIRECTOR: simplify setting applyColor to false

Changed paths:
    engines/director/graphics.cpp


diff --git a/engines/director/graphics.cpp b/engines/director/graphics.cpp
index beaaba2fae..099873c6dc 100644
--- a/engines/director/graphics.cpp
+++ b/engines/director/graphics.cpp
@@ -289,24 +289,6 @@ Graphics::MacDrawPixPtr DirectorEngine::getInkDrawPixel() {
 void DirectorPlotData::setApplyColor() {
 	applyColor = false;
 
-	if (foreColor == colorBlack && backColor == colorWhite)
-		applyColor = false;
-
-	switch (ink) {
-	case kInkTypeReverse:
-	case kInkTypeNotReverse:
-	case kInkTypeAddPin:
-	case kInkTypeAdd:
- 	case kInkTypeSubPin:
-	case kInkTypeLight:
-	case kInkTypeSub:
-	case kInkTypeDark:
-	case kInkTypeBackgndTrans:
-		applyColor = false;
-	default:
-		break;
-	}
-
 	if (foreColor != colorBlack) {
 		if (ink != kInkTypeGhost && ink != kInkTypeNotGhost)
 			applyColor = true;