mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-14 16:41:13 +00:00
- moved several IWAD dependent files into the game_support resource
* sprite offset definitions, which are IWAD dependent * Freedoom's decal overrides * conversation ID definitions for the Strife teasers * the fallback BigFont now can also be loaded by IWADs which declare themselves as GAME_Heretic or GAME_Hexen. # Conflicts: # src/gamedata/fonts/v_font.cpp
This commit is contained in:
parent
1d8f735a27
commit
6999c89cbb
9 changed files with 8 additions and 2 deletions
|
@ -3599,7 +3599,7 @@ void V_InitFonts()
|
|||
}
|
||||
if (!(SmallFont2 = V_GetFont("SmallFont2"))) // Only used by Strife
|
||||
{
|
||||
if (Wads.CheckNumForName ("STBFN033", ns_graphics) >= 0)
|
||||
if (Wads.CheckNumForName("STBFN033", ns_graphics) >= 0)
|
||||
{
|
||||
SmallFont2 = new FFont("SmallFont2", "STBFN%.3d", "defsmallfont2", HU_FONTSTART, HU_FONTSIZE, HU_FONTSTART, -1);
|
||||
}
|
||||
|
@ -3610,12 +3610,18 @@ void V_InitFonts()
|
|||
|
||||
if (!(BigFont = V_GetFont("BigFont")))
|
||||
{
|
||||
if (gameinfo.gametype & GAME_Raven)
|
||||
if (Wads.CheckNumForName("FONTB_S") >= 0)
|
||||
{
|
||||
BigFont = new FFont("BigFont", "FONTB%02u", "defbigfont", HU_FONTSTART, HU_FONTSIZE, 1, -1);
|
||||
}
|
||||
}
|
||||
|
||||
if (!BigFont)
|
||||
{
|
||||
// Load the generic fallback if no BigFont is found.
|
||||
BigFont = V_GetFont("BigFont", "ZBIGFONT");
|
||||
}
|
||||
|
||||
// let PWAD BIGFONTs override the stock BIGUPPER font. (This check needs to be made smarter.)
|
||||
if (BigUpper && BigFont->Type != FFont::Folder && BigUpper->Type == FFont::Folder)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue