team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow 'gl_font creditsfont' (and potentially others) for eukara. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5435 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-03-16 06:45:55 +00:00
parent dc999091aa
commit 15b1e813a4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/gl/gl_font.c
View File

@ -2144,9 +2144,12 @@ struct font_s *Font_LoadFont(const char *fontfilename, float vheight)
if (f->faces < MAX_FACES)
{
size_t lumpsize;
qbyte lumptype;
void *lumpdata;
lumpdata = W_GetLumpName("conchars", &lumpsize, &lumptype);
qbyte lumptype = 0;
void *lumpdata = NULL;
if ((!lumpdata || lumptype != TYP_HLFONT) && *fontfilename)
lumpdata = W_GetLumpName(fontfilename, &lumpsize, &lumptype);
if (!lumpdata || lumptype != TYP_HLFONT)
lumpdata = W_GetLumpName("conchars", &lumpsize, &lumptype);
if (lumpdata && lumptype == TYP_HLFONT)
{
fontface_t *fa = Z_Malloc(sizeof(*fa));