mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-12-01 08:31:45 +00:00
- added a font.inf for Strife's small font because its automatically calculated height is not a good match for displaying the dialogues.
This commit is contained in:
parent
1e2ab2170f
commit
c65ecbc807
2 changed files with 3 additions and 3 deletions
|
@ -80,7 +80,6 @@ FFont::FFont (const char *name, const char *nametemplate, const char *filetempla
|
||||||
|
|
||||||
noTranslate = notranslate;
|
noTranslate = notranslate;
|
||||||
Lump = fdlump;
|
Lump = fdlump;
|
||||||
FontHeight = 0;
|
|
||||||
GlobalKerning = false;
|
GlobalKerning = false;
|
||||||
FontName = name;
|
FontName = name;
|
||||||
Next = FirstFont;
|
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.
|
// 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);
|
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);
|
FStringf infpath("fonts/%s/font.inf", filetemplate);
|
||||||
|
|
||||||
unsigned index = folderdata.FindEx([=](const FolderEntry &entry)
|
unsigned index = folderdata.FindEx([=](const FolderEntry &entry)
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
FontHeight 11
|
||||||
|
|
Loading…
Reference in a new issue