DIRECTOR: Register and use additional fonts

scummvm · Jan 27, 2017 · d8c8b78 · d8c8b78
1 parent fae09e9
commit d8c8b78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
@@ -868,7 +868,7 @@ void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Commo
 	if (_vm->_currentScore->_fontMap.contains(textCast->fontId)) {
 		// We need to make sure that teh Shared Cast fonts have been loaded in?
 		//might need a mapping table here of our own.
-		textCast->fontId = _vm->_wm->_fontMan->getFontIdByName(_vm->_currentScore->_fontMap[textCast->fontId]);
+		//textCast->fontId = _vm->_wm->_fontMan->getFontIdByName(_vm->_currentScore->_fontMap[textCast->fontId]);
 	}
 
 	Graphics::MacFont macFont = Graphics::MacFont(textCast->fontId, textCast->fontSize, textCast->textSlant);

diff --git a/engines/director/score.cpp b/engines/director/score.cpp
@@ -914,6 +914,8 @@ void Score::loadFontMap(Common::SeekableSubReadStreamEndian &stream) {
 		}
 
 		_fontMap[id] = font;
+		_vm->_wm->_fontMan->registerFontMapping(id, font);
+
 		debug(3, "Fontmap. ID %d Font %s", id, font.c_str());
 		currentRawPosition = stream.pos();
 		stream.seek(positionInfo);