zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-17 01:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: V_GetFont must load the translations once the game has been set up.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-25 19:44:06 +02:00
parent 2828dbe095
commit 667b2d6bf4
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/common/fonts/v_font.cpp
View file

@ -89,6 +89,7 @@ FFont* SmallFont, * SmallFont2, * BigFont, * BigUpper, * ConFont, * Intermission
FFont *FFont::FirstFont = nullptr; FFont *FFont::FirstFont = nullptr;
int NumTextColors; int NumTextColors;
static bool translationsLoaded;
// PRIVATE DATA DEFINITIONS ------------------------------------------------ // PRIVATE DATA DEFINITIONS ------------------------------------------------
@ -138,7 +139,9 @@ FFont *V_GetFont(const char *name, const char *fontlumpname)
head == MAKE_ID(0xE1,0xE6,0xD5,0x1A)) head == MAKE_ID(0xE1,0xE6,0xD5,0x1A))
{ {
FFont *CreateSingleLumpFont (const char *fontname, int lump); FFont *CreateSingleLumpFont (const char *fontname, int lump);
return CreateSingleLumpFont (name, lump); font = CreateSingleLumpFont (name, lump);
if (translationsLoaded) font->LoadTranslations();
return font;
} }
} }
FTextureID picnum = TexMan.CheckForTexture (name, ETextureType::Any); FTextureID picnum = TexMan.CheckForTexture (name, ETextureType::Any);
@ -148,12 +151,16 @@ FFont *V_GetFont(const char *name, const char *fontlumpname)
if (tex && tex->GetSourceLump() >= folderfile) if (tex && tex->GetSourceLump() >= folderfile)
{ {
FFont *CreateSinglePicFont(const char *name); FFont *CreateSinglePicFont(const char *name);
return CreateSinglePicFont (name); font = CreateSinglePicFont (name);
if (translationsLoaded) font->LoadTranslations();
return font;
} }
} }
if (folderdata.Size() > 0) if (folderdata.Size() > 0)
{ {
return new FFont(name, nullptr, name, HU_FONTSTART, HU_FONTSIZE, 1, -1); font = new FFont(name, nullptr, name, HU_FONTSTART, HU_FONTSIZE, 1, -1);
if (translationsLoaded) font->LoadTranslations();
return font;
} }
} }
return font; return font;
@ -834,6 +841,7 @@ void V_LoadTranslations()
if (OriginalSmallFont != nullptr) OriginalSmallFont->SetDefaultTranslation(colors); if (OriginalSmallFont != nullptr) OriginalSmallFont->SetDefaultTranslation(colors);
NewSmallFont->SetDefaultTranslation(colors); NewSmallFont->SetDefaultTranslation(colors);
} }
translationsLoaded = true;
} }
void V_ClearFonts() void V_ClearFonts()