From 90ab830ff94fd9ac8cf06e9390dd1fd711ed01cd Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 26 Feb 2019 19:19:03 +0100 Subject: [PATCH] - added a workaround for mods using the name CONFONT directly. In the old system it just loaded the font a second time, but with the folder based setup there is no file named CONFONT anymore so it needs to be dealt with explicitly. --- src/gamedata/fonts/v_font.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gamedata/fonts/v_font.cpp b/src/gamedata/fonts/v_font.cpp index 6ec033c9e5..d715ecf4b1 100644 --- a/src/gamedata/fonts/v_font.cpp +++ b/src/gamedata/fonts/v_font.cpp @@ -855,6 +855,7 @@ int stripaccent(int code) FFont *V_GetFont(const char *name, const char *fontlumpname) { + if (!stricmp(name, "CONFONT")) name = "ConsoleFont"; // several mods have used the name CONFONT directly and effectively duplicated the font. FFont *font = FFont::FindFont (name); if (font == nullptr) {