[Scummvm-git-logs] scummvm branch-2-7 -> 8d878cb034e7551793d6d1a08d48d49fe3837829

[sev-]

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:
8d878cb034 DIRECTOR: Fix regression from 48740a2ad12


Commit: 8d878cb034e7551793d6d1a08d48d49fe3837829
    https://github.com/scummvm/scummvm/commit/8d878cb034e7551793d6d1a08d48d49fe3837829
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-10T00:51:33+01:00

Commit Message:
DIRECTOR: Fix regression from 48740a2ad12

The color values went inverted, but in several places they left
untouched.

In general, it is not a good idea to have this hardcoded, but at least
now we have this addressed.

Changed paths:
    engines/director/castmember.cpp
    graphics/macgui/macbutton.cpp
    graphics/macgui/mactext.cpp


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 2d94a0159f8..ed6ac122171 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -1075,7 +1075,7 @@ TextCastMember::TextCastMember(Cast *cast, uint16 castId, Common::SeekableReadSt
 	_maxHeight = _textHeight = 0;
 
 	_bgcolor = 0;
-	_fgcolor = 0;
+	_fgcolor = 0xff;
 
 	_textFlags = 0;
 	_scroll = 0;
diff --git a/graphics/macgui/macbutton.cpp b/graphics/macgui/macbutton.cpp
index da770765404..ff68154e73c 100644
--- a/graphics/macgui/macbutton.cpp
+++ b/graphics/macgui/macbutton.cpp
@@ -145,14 +145,14 @@ bool MacButton::draw(bool forceRedraw) {
 	switch (_buttonType) {
 	case kCheckBox: {
 		Common::Rect c = Common::Rect(r.left, r.top + 2, r.left + 10, r.top + 2 + 10);
-		Graphics::drawRect1(c, 0, _wm->getDrawPixel(), &pd);
+		Graphics::drawRect1(c, 0xff, _wm->getDrawPixel(), &pd);
 		break;
 	}
 	case kRound:
-		Graphics::drawRoundRect1(r, 4, 0, false, _wm->getDrawPixel(), &pd);
+		Graphics::drawRoundRect1(r, 4, 0xff, false, _wm->getDrawPixel(), &pd);
 		break;
 	case kRadio:
-		Graphics::drawEllipse(r.left, r.top + 2, r.left + 11, r.top + 13, 0, false, _wm->getDrawPixel(), &pd);
+		Graphics::drawEllipse(r.left, r.top + 2, r.left + 11, r.top + 13, 0xff, false, _wm->getDrawPixel(), &pd);
 		break;
 	}
 
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 4f07c48edb3..df1425425b1 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -1380,7 +1380,7 @@ bool MacText::draw(bool forceRedraw) {
 
 	for (int bb = 0; bb < _border; bb++) {
 		Common::Rect borderRect(bb, bb, _composeSurface->w - bb, _composeSurface->h - bb);
-		_composeSurface->frameRect(borderRect, 0);
+		_composeSurface->frameRect(borderRect, 0xff);
 	}
 
 	if (_selectedText.endY != -1)