zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- for the map name on the automap, fall back to the original SmallFont if the actual one cannot print it. 

This is mainly for mods which provide a new font but do not alter the automap texts, a good example is Hell Revealed 2.
This commit is contained in:
Christoph Oelckers 2019-07-17 20:28:07 +02:00
parent b360f04e28
commit 95349822c4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/g_statusbar/shared_sbar.cpp
View File

@ -661,6 +661,11 @@ void DBaseStatusBar::DoDrawAutomapHUD(int crdefault, int highlight)
FormatMapName(primaryLevel, crdefault, &textbuffer); FormatMapName(primaryLevel, crdefault, &textbuffer);
if (!generic_ui)
{
if (!font->CanPrint(textbuffer)) font = OriginalSmallFont;
}
auto lines = V_BreakLines(font, vwidth - 32, textbuffer, true); auto lines = V_BreakLines(font, vwidth - 32, textbuffer, true);
auto numlines = lines.Size(); auto numlines = lines.Size();
auto finalwidth = lines.Last().Width; auto finalwidth = lines.Last().Width;

7
wadsrc/static/zscript/ui/statusbar/alt_hud.zs
View File

@ -731,7 +731,7 @@ class AltHud ui
if (withmapname) if (withmapname)
{ {
let font = generic_ui? NewSmallFont : SmallFont; let font = generic_ui? NewSmallFont : SmallFont.CanPrint(Level.LevelName)? SmallFont : OriginalSmallFont;
int hh = font.GetHeight(); int hh = font.GetHeight();
screen.DrawText(font, hudcolor_titl, hudwidth - 6 - font.StringWidth(Level.MapName), ypos, Level.MapName, screen.DrawText(font, hudcolor_titl, hudwidth - 6 - font.StringWidth(Level.MapName), ypos, Level.MapName,
@ -953,7 +953,10 @@ class AltHud ui
DrawTimeString(font, hudcolor_ltim, Level.maptime, hudwidth-2, bottom, 1); DrawTimeString(font, hudcolor_ltim, Level.maptime, hudwidth-2, bottom, 1);
} }
screen.DrawText(font, Font.CR_BRICK, 2, hudheight - fonth - 1, Level.FormatMapName(hudcolor_titl), let amstr = Level.FormatMapName(hudcolor_titl);
font = generic_ui? NewSmallFont : SmallFont.CanPrint(amstr)? SmallFont : OriginalSmallFont;
screen.DrawText(font, Font.CR_BRICK, 2, hudheight - fonth - 1, amstr,
DTA_KeepRatio, true, DTA_KeepRatio, true,
DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight); DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight);