From 15b1e813a4c9c95c9ce19209803fb0f346745911 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sat, 16 Mar 2019 06:45:55 +0000 Subject: [PATCH] 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 --- engine/gl/gl_font.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/engine/gl/gl_font.c b/engine/gl/gl_font.c index 9c52b75c8..0a04ade5a 100644 --- a/engine/gl/gl_font.c +++ b/engine/gl/gl_font.c @@ -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));