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

[djsrv]

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:
ceb34312a7 DIRECTOR: Simplify font ID handling


Commit: ceb34312a7d6f31f197ba9ce5b9d29c8538537f6
    https://github.com/scummvm/scummvm/commit/ceb34312a7d6f31f197ba9ce5b9d29c8538537f6
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-02T18:22:15-04:00

Commit Message:
DIRECTOR: Simplify font ID handling

Per-cast IDs are now mapped to WM IDs in importStxt so they don't need
to be mapped later.

Changed paths:
    engines/director/castmember.cpp


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 7c7c47e1f0..615225b9df 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -679,7 +679,11 @@ Graphics::TextAlign TextCastMember::getAlignment() {
 }
 
 void TextCastMember::importStxt(const Stxt *stxt) {
-	_fontId = stxt->_style.fontId;
+	if (_cast->_fontMap.contains(stxt->_style.fontId)) {
+		_fontId = _cast->_fontMap[stxt->_style.fontId];
+	} else {
+		_fontId = 1; // fall back to Geneva
+	}
 	_textSlant = stxt->_style.textSlant;
 	_fontSize = stxt->_style.fontSize;
 	_fgpalinfo1 = stxt->_style.r;
@@ -690,7 +694,7 @@ void TextCastMember::importStxt(const Stxt *stxt) {
 }
 
 Graphics::MacWidget *TextCastMember::createWidget(Common::Rect &bbox, Channel *channel) {
-	Graphics::MacFont *macFont = new Graphics::MacFont(_cast->_fontMap[_fontId], _fontSize, _textSlant);
+	Graphics::MacFont *macFont = new Graphics::MacFont(_fontId, _fontSize, _textSlant);
 	Graphics::MacWidget *widget = nullptr;
 	Common::Rect dims(bbox);
 
@@ -749,7 +753,7 @@ void TextCastMember::setText(const char *text) {
 		return;
 
 	// If text has changed, use the cached formatting from first STXT in this castmember.
-	Common::String formatting = Common::String::format("\001\016%04x%02x%04x%04x%04x%04x", _cast->_fontMap[_fontId], _textSlant, _fontSize, _fgpalinfo1, _fgpalinfo2, _fgpalinfo3);
+	Common::String formatting = Common::String::format("\001\016%04x%02x%04x%04x%04x%04x", _fontId, _textSlant, _fontSize, _fgpalinfo1, _fgpalinfo2, _fgpalinfo3);
 	_ptext = text;
 	_ftext = formatting + text;