[Scummvm-git-logs] scummvm master -> 5af941f878734e8e841b0c93bc0db7af9b4baaa3

[npjg]

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:
bc38519523 DIRECTOR: Fix bitwise reverse ink
5af941f878 DIRECTOR: Reset default text interlinear to 0


Commit: bc3851952355122a20fa1ab273ddafb9c5668840
    https://github.com/scummvm/scummvm/commit/bc3851952355122a20fa1ab273ddafb9c5668840
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-03T09:00:06-04:00

Commit Message:
DIRECTOR: Fix bitwise reverse ink

Changed paths:
    engines/director/graphics.cpp


diff --git a/engines/director/graphics.cpp b/engines/director/graphics.cpp
index b85c69adc4..e54c938220 100644
--- a/engines/director/graphics.cpp
+++ b/engines/director/graphics.cpp
@@ -845,7 +845,7 @@ void inkDrawPixel(int x, int y, int color, void *data) {
 		break;
 	case kInkTypeReverse:
 		// TODO: Migrate from Stage to here
-		*dst ^= *src;
+		*dst ^= ~(*src);
 		break;
 	case kInkTypeGhost:
 		if (*src != p->numColors - 1)


Commit: 5af941f878734e8e841b0c93bc0db7af9b4baaa3
    https://github.com/scummvm/scummvm/commit/5af941f878734e8e841b0c93bc0db7af9b4baaa3
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-03T09:00:06-04:00

Commit Message:
DIRECTOR: Reset default text interlinear to 0

Without this, text bounding boxes are wrong in The Apartment.

Changed paths:
    engines/director/castmember.cpp


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 2cad3f16ed..45bd4831fb 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -390,7 +390,7 @@ void TextCastMember::createWidget() {
 
 	switch (_type) {
 	case kCastText:
-		_widget = new Graphics::MacText(g_director->getStage(), 0, 0, _initialRect.width(), _initialRect.height(), g_director->_wm, _ftext, macFont, getForeColor(), getBackColor(), _initialRect.width(), getAlignment(), 1, _borderSize, _gutterSize, _boxShadow, _textShadow);
+		_widget = new Graphics::MacText(g_director->getStage(), 0, 0, _initialRect.width(), _initialRect.height(), g_director->_wm, _ftext, macFont, getForeColor(), getBackColor(), _initialRect.width(), getAlignment(), 0, _borderSize, _gutterSize, _boxShadow, _textShadow);
 
 		((Graphics::MacText *)_widget)->draw();
 		break;