[Scummvm-git-logs] scummvm master -> d22fea192480949f1879777ab667b44b66f19825

[npjg]

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:
d22fea1924 GRAPHICS: MACGUI: MacText: Render chunks with individual palinfo


Commit: d22fea192480949f1879777ab667b44b66f19825
    https://github.com/scummvm/scummvm/commit/d22fea192480949f1879777ab667b44b66f19825
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-25T13:47:56-04:00

Commit Message:
GRAPHICS: MACGUI: MacText: Render chunks with individual palinfo

Changed paths:
    graphics/macgui/mactext.cpp
    graphics/macgui/mactext.h


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 85f2dd7594..4575f2b4a8 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -573,7 +573,7 @@ void MacText::render(int from, int to) {
 				yOffset = maxHeightForRow - _textLines[i].chunks[j].font->getFontHeight() - 2;
 			}
 
-			_textLines[i].chunks[j].getFont()->drawString(_surface, convertBiDiU32String(_textLines[i].chunks[j].text), xOffset, _textLines[i].y + yOffset, w, _fgcolor);
+			_textLines[i].chunks[j].getFont()->drawString(_surface, convertBiDiU32String(_textLines[i].chunks[j].text), xOffset, _textLines[i].y + yOffset, w, _textLines[i].chunks[j].fgcolor);
 			xOffset += _textLines[i].chunks[j].getFont()->getStringWidth(_textLines[i].chunks[j].text);
 		}
 	}
diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h
index e04a9c5010..cf5227d70a 100644
--- a/graphics/macgui/mactext.h
+++ b/graphics/macgui/mactext.h
@@ -49,6 +49,7 @@ struct MacFontRun {
 	uint16 palinfo1;
 	uint16 palinfo2;
 	uint16 palinfo3;
+	uint16 fgcolor;
 
 	const Font *font;
 	MacWindowManager *wm;
@@ -74,6 +75,7 @@ struct MacFontRun {
 		palinfo1  = palinfo1_;
 		palinfo2  = palinfo2_;
 		palinfo3  = palinfo3_;
+		fgcolor   = wm_->findBestColor(palinfo1_ & 0xff, palinfo2_ & 0xff, palinfo3_ & 0xff);
 		font      = nullptr;
 	}