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

sev- sev at scummvm.org
Wed Jan 18 10:24:44 CET 2017


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:
6558e94ac3 GRAPHICS: Plug in loaded MacFONTFonts into MacFontManager
cc82d8f619 DIRECTOR: More debug output to mac font loading test


Commit: 6558e94ac372ff6a65ffa982d7699cb5ab58ef47
    https://github.com/scummvm/scummvm/commit/6558e94ac372ff6a65ffa982d7699cb5ab58ef47
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-18T10:24:47+01:00

Commit Message:
GRAPHICS: Plug in loaded MacFONTFonts into MacFontManager

Changed paths:
    graphics/macgui/macfontmanager.cpp


diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 721f1a7..ee91ae4 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -174,8 +174,32 @@ void MacFontManager::loadFonts() {
 				Common::Array<Graphics::MacFontFamily::AsscEntry> *assoc = fontFamily.getAssocTable();
 
 				for (uint i = 0; i < assoc->size(); i++) {
-					debug("size: %d style: %d id: %d", (*assoc)[i]._fontSize, (*assoc)[i]._fontSize,
+					debug("size: %d style: %d id: %d", (*assoc)[i]._fontSize, (*assoc)[i]._fontStyle,
 											(*assoc)[i]._fontID);
+
+					Common::SeekableReadStream *fontstream = fontFile->getResource(MKTAG('N', 'F', 'N', 'T'), (*assoc)[i]._fontID);
+					MacFont *macfont;
+					Graphics::MacFONTFont *font;
+					Common::String fontName;
+
+					if (fontstream) {
+						font = new Graphics::MacFONTFont;
+						font->loadFont(*fontstream);
+
+						delete fontstream;
+
+						fontName = fontFile->getResName(MKTAG('N', 'F', 'N', 'T'), (*assoc)[i]._fontID);
+					} else {
+						fontstream = fontFile->getResource(MKTAG('F', 'O', 'N', 'T'), (*assoc)[i]._fontID);
+					}
+
+					macfont = new MacFont(_fontNames.getVal(fontName, kMacFontNonStandard), (*assoc)[i]._fontSize, (*assoc)[i]._fontStyle);
+
+					FontMan.assignFontToName(fontName, font);
+					//macfont->setBdfFont(font);
+					_fontRegistry.setVal(fontName, macfont);
+
+					debug(2, " %s", fontName.c_str());
 				}
 
 				delete fond;


Commit: cc82d8f619d2bc8ad7501b3f4db9922ee0c1cdd4
    https://github.com/scummvm/scummvm/commit/cc82d8f619d2bc8ad7501b3f4db9922ee0c1cdd4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-18T10:25:51+01:00

Commit Message:
DIRECTOR: More debug output to mac font loading test

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 95f8940..89018f5 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -206,6 +206,9 @@ void DirectorEngine::testFonts() {
 	if (fonds.size() > 0) {
 		for (Common::Array<uint16>::iterator iterator = fonds.begin(); iterator != fonds.end(); ++iterator) {
 			Common::SeekableReadStream *stream = fontFile->getResource(MKTAG('F', 'O', 'N', 'D'), *iterator);
+			Common::String name = fontFile->getResName(MKTAG('F', 'O', 'N', 'D'), *iterator);
+
+			debug("Font: %s", name.c_str());
 
 			Graphics::MacFontFamily font;
 			font.load(*stream);





More information about the Scummvm-git-logs mailing list