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

[dreammaster]

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:
cb7620d44c GLK: Removed unused _lcd Conf variable
e05a64992b TINSEL: Workaround for black talk text showing for Mac DW1


Commit: cb7620d44c5b39a70763eaf2ce4166b5b019990d
    https://github.com/scummvm/scummvm/commit/cb7620d44c5b39a70763eaf2ce4166b5b019990d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-13T18:43:16-07:00

Commit Message:
GLK: Removed unused _lcd Conf variable

Changed paths:
    engines/glk/conf.cpp
    engines/glk/conf.h


diff --git a/engines/glk/conf.cpp b/engines/glk/conf.cpp
index f645865c90..2c63cbf94a 100644
--- a/engines/glk/conf.cpp
+++ b/engines/glk/conf.cpp
@@ -70,7 +70,7 @@ Conf::Conf(InterpreterType interpType) : _interpType(interpType), _graphics(true
 		_windowColor(parseColor(WHITE)), _windowSave(parseColor(WHITE)),
 		_sound(true), _speak(false), _speakInput(false), _styleHint(1),
 		_scrollBg(parseColor(SCROLL_BG)), _scrollFg(parseColor(SCROLL_FG)),
-		_lcd(1), _scrollWidth(0), _safeClicks(false) {
+		_scrollWidth(0), _safeClicks(false) {
 	g_conf = this;
 	_imageW = _width;
 	_imageH = _height;
@@ -176,7 +176,6 @@ void Conf::synchronize() {
 	syncAsColor("bordercolor", _borderSave);
 	syncAsColor("windowcolor", _windowColor);
 	syncAsColor("windowcolor", _windowSave);
-	syncAsInt("lcd", _lcd);
 
 	syncAsColor("caretcolor", _propInfo._caretColor);
 	syncAsInt("caretshape", _propInfo._caretShape);
diff --git a/engines/glk/conf.h b/engines/glk/conf.h
index ac02ac543f..a0a2134a6a 100644
--- a/engines/glk/conf.h
+++ b/engines/glk/conf.h
@@ -86,7 +86,6 @@ public:
 	double _gamma;
 	uint _borderColor, _borderSave;
 	uint _windowColor, _windowSave;
-	int _lcd;
 	int _scrollWidth;
 	uint _scrollBg, _scrollFg;
 	bool _graphics;


Commit: e05a64992b06d3b118ce8a06d0c1b16e6b54a3db
    https://github.com/scummvm/scummvm/commit/e05a64992b06d3b118ce8a06d0c1b16e6b54a3db
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-13T19:11:19-07:00

Commit Message:
TINSEL: Workaround for black talk text showing for Mac DW1

I'm not sure of the underlying cause, but as a suitable
workaround, when playing the Mac version it'll simply use
the tooltip font instead, which is at least properly visible

Changed paths:
    engines/tinsel/font.cpp
    engines/tinsel/font.h


diff --git a/engines/tinsel/font.cpp b/engines/tinsel/font.cpp
index 70ecc606dd..d1271cbdac 100644
--- a/engines/tinsel/font.cpp
+++ b/engines/tinsel/font.cpp
@@ -36,6 +36,12 @@ void Font::SetTagFontHandle(SCNHANDLE hFont) {
 		SetTalkFontHandle(hFont);	// Also re-use for talk text
 }
 
+SCNHANDLE Font::GetTalkFontHandle() {
+	// FIXME: Mac Discworld 1 was rendering the talk font as black.
+	// Currently hacking around it by simply using the tooltip font
+	return TinselV1Mac ? _hTagFont : _hTalkFont;
+}
+
 void Font::FettleFontPal(SCNHANDLE fontPal) {
 	const FONT *pFont;
 	IMAGE *pImg;
diff --git a/engines/tinsel/font.h b/engines/tinsel/font.h
index d5bce97bd3..4bf4723771 100644
--- a/engines/tinsel/font.h
+++ b/engines/tinsel/font.h
@@ -49,7 +49,7 @@ public:
 	/**
 	 * Return hTalkFont handle.
 	 */
-	SCNHANDLE GetTalkFontHandle() { return _hTalkFont; }
+	SCNHANDLE GetTalkFontHandle();
 
 	/**
 	 * Called from dec_tagfont() Glitter function. Store the tag font handle.