From c65ecbc807c046c8a891a81d8e0db3511f2d33b3 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 6 Apr 2019 07:44:09 +0200 Subject: [PATCH] - added a font.inf for Strife's small font because its automatically calculated height is not a good match for displaying the dialogues. --- src/gamedata/fonts/font.cpp | 4 +--- .../static/filter/game-strife/fonts/defsmallfont/font.inf | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/font.inf diff --git a/src/gamedata/fonts/font.cpp b/src/gamedata/fonts/font.cpp index 195195316..e9bed462c 100644 --- a/src/gamedata/fonts/font.cpp +++ b/src/gamedata/fonts/font.cpp @@ -80,7 +80,6 @@ FFont::FFont (const char *name, const char *nametemplate, const char *filetempla noTranslate = notranslate; Lump = fdlump; - FontHeight = 0; GlobalKerning = false; FontName = name; Next = FirstFont; @@ -111,9 +110,8 @@ FFont::FFont (const char *name, const char *nametemplate, const char *filetempla // For anything else, each folder is being treated as an atomic, self-contained unit and mixing from different glyph sets is blocked. Wads.GetLumpsInFolder(path, folderdata, nametemplate == nullptr); - if (nametemplate == nullptr) + //if (nametemplate == nullptr) { - // Only take font.inf from the actual folder we are processing but not from an older folder that may have been superseded. FStringf infpath("fonts/%s/font.inf", filetemplate); unsigned index = folderdata.FindEx([=](const FolderEntry &entry) diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/font.inf b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/font.inf new file mode 100644 index 000000000..74fff1a02 --- /dev/null +++ b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/font.inf @@ -0,0 +1,2 @@ +FontHeight 11 +