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

[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:
ce486ae58e DIRECTOR: LINGO: Properly implement `get textFont of field`


Commit: ce486ae58e6ac9173a9e181d2e83c49ac96c2d2b
    https://github.com/scummvm/scummvm/commit/ce486ae58e6ac9173a9e181d2e83c49ac96c2d2b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-06-03T16:02:34+02:00

Commit Message:
DIRECTOR: LINGO: Properly implement `get textFont of field`

Changed paths:
    engines/director/lingo/lingo-object.cpp


diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index 5b397dfc33a..a6b2c2ffca7 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -964,7 +964,8 @@ Datum TextCastMember::getField(int field) {
 		}
 		break;
 	case kTheTextFont:
-		d.u.i = _fontId;
+		d.type = STRING;
+		d.u.s = new Common::String(g_director->_wm->_fontMan->getFontName(_fontId));
 		break;
 	case kTheTextHeight:
 		d.u.i = getTextHeight();
@@ -1028,6 +1029,8 @@ bool TextCastMember::setField(int field, const Datum &d) {
 	}
 		return true;
 	case kTheTextFont:
+		warning("STUB: set textFont");
+		// d is STRING here
 		_fontId = d.asInt();
 		_modified = true;
 		return false;
@@ -1077,12 +1080,17 @@ Datum TextCastMember::getChunkField(int field, int start, int end) {
 		else
 			d.u.i = getForeColor();
 		break;
-	case kTheTextFont:
+	case kTheTextFont: {
+		int fontId;
 		if (_widget)
-			d.u.i = macText->getTextFont(start, end);
+			fontId = macText->getTextFont(start, end);
 		else
-			d.u.i = _fontId;
+			fontId = _fontId;
+
+		d.type = STRING;
+		d.u.s = new Common::String(g_director->_wm->_fontMan->getFontName(fontId));
 		break;
+		}
 	case kTheTextHeight:
 		warning("TextCastMember::getChunkField getting text height(line spacing) is not implemented yet, returning the default one");
 		d.u.i = _lineSpacing;