[Scummvm-git-logs] scummvm master -> 5a83cb5fc95999fcfedf1a232c1c877580c9db95

[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:
5a83cb5fc9 DIRECTOR: Use unmapped font ID in D4


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

Commit Message:
DIRECTOR: Use unmapped font ID in D4

The D4 font map is not implemented yet, so we can't use that.

Changed paths:
    engines/director/castmember.cpp


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 615225b9df..f5a6286b5f 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -679,10 +679,16 @@ Graphics::TextAlign TextCastMember::getAlignment() {
 }
 
 void TextCastMember::importStxt(const Stxt *stxt) {
-	if (_cast->_fontMap.contains(stxt->_style.fontId)) {
-		_fontId = _cast->_fontMap[stxt->_style.fontId];
+	if (_cast->_version < kFileVer400) {
+		if (_cast->_fontMap.contains(stxt->_style.fontId)) {
+			_fontId = _cast->_fontMap[stxt->_style.fontId];
+		} else {
+			_fontId = 1; // fall back to Geneva
+		}
 	} else {
-		_fontId = 1; // fall back to Geneva
+		// FIXME: This should use the font map.
+		// D4 font maps are not implemented yet, so just use the unmapped ID.
+		_fontId = stxt->_style.fontId;
 	}
 	_textSlant = stxt->_style.textSlant;
 	_fontSize = stxt->_style.fontSize;