Skip to content
Permalink
Browse files

- fixed: The OriginalSmallFont must always be created, even when the …

…actual SmallFont is not the IWAD default.
  • Loading branch information...
coelckers committed Aug 10, 2019
1 parent 1e1ec2d commit 5953f492c1d6ac3c4ff2e5471bf2c6b1807b92d8
Showing with 12 additions and 3 deletions.
  1. +12 −3 src/gamedata/fonts/v_font.cpp
@@ -1609,8 +1609,6 @@ void V_InitFonts()
SmallFont = new FFont("SmallFont", "FONTA%02u", "defsmallfont", HU_FONTSTART, HU_FONTSIZE, 1, -1);
SmallFont->SetCursor('[');
}
OriginalSmallFont = new FFont("OriginalSmallFont", "FONTA%02u", "defsmallfont", HU_FONTSTART, HU_FONTSIZE, 1, -1, -1, false, true);
OriginalSmallFont->SetCursor('[');
}
else if (Wads.CheckNumForName("STCFN033", ns_graphics) >= 0)
{
@@ -1626,9 +1624,20 @@ void V_InitFonts()
{
SmallFont = new FFont("SmallFont", "STCFN%.3d", "defsmallfont", HU_FONTSTART, HU_FONTSIZE, HU_FONTSTART, -1);
}
OriginalSmallFont = new FFont("OriginalSmallFont", "STCFN%.3d", "defsmallfont", HU_FONTSTART, HU_FONTSIZE, HU_FONTSTART, -1, -1, false, true);
}
}

// Create the original small font as a fallback for incomplete definitions.
if (Wads.CheckNumForName("FONTA_S") >= 0)
{
OriginalSmallFont = new FFont("OriginalSmallFont", "FONTA%02u", "defsmallfont", HU_FONTSTART, HU_FONTSIZE, 1, -1, -1, false, true);
OriginalSmallFont->SetCursor('[');
}
else if (Wads.CheckNumForName("STCFN033", ns_graphics) >= 0)
{
OriginalSmallFont = new FFont("OriginalSmallFont", "STCFN%.3d", "defsmallfont", HU_FONTSTART, HU_FONTSIZE, HU_FONTSTART, -1, -1, false, true);
}

if (SmallFont)
{
uint32_t colors[256] = {};

0 comments on commit 5953f49

Please sign in to comment.
You can’t perform that action at this time.