backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed font

Browse source
This commit is contained in:
JuiceyDev 2026-03-06 00:34:36 +01:00
parent 1f37e1d422
commit fddd777399
3 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Minecraft.Client/Build/Common/UI/UIBitmapFont.cpp
View file

@ -98,9 +98,17 @@ UIBitmapFont::UIBitmapFont( SFontData &sfontdata )
BufferedImage bimg(sfontdata.m_wstrFilename); BufferedImage bimg(sfontdata.m_wstrFilename);
int *bimgData = bimg.getData(); int *bimgData = bimg.getData();
if (bimgData == nullptr)
{
fprintf(stderr, "[UIBitmapFont] ERROR: failed to load font image for '%s' — font file missing or corrupt.\n",
sfontdata.m_strFontName.c_str());
m_cFontData = new CFontData(); // default/empty — avoids null deref downstream
return;
}
m_cFontData = new CFontData(sfontdata, bimgData); m_cFontData = new CFontData(sfontdata, bimgData);
//delete [] bimgData; //delete [] bimgData;
} }

10
Minecraft.Client/Build/Common/UI/UIFontData.cpp
View file

@ -155,6 +155,16 @@ CFontData::CFontData(SFontData &sFontData, int *pbRawImage)
{ {
this->m_sFontData = &sFontData; this->m_sFontData = &sFontData;
if (pbRawImage == nullptr)
{
// Font image failed to load; leave raw buffers null so the font renders nothing
// rather than crashing. UIBitmapFont already logs an error in this case.
m_pbRawImage = nullptr;
m_kerningTable = nullptr;
m_pfAdvanceTable = nullptr;
return;
}
// INITIALISE ALPHA CHANNEL // // INITIALISE ALPHA CHANNEL //
// Glyph Archive (1Byte per pixel). // Glyph Archive (1Byte per pixel).

11
Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp
View file

@ -669,15 +669,8 @@ app.DebugPrintf("---ReadProductCodes()\n");
app.loadMediaArchive(); app.loadMediaArchive();
app.loadStringTable(); app.loadStringTable();
// Use the actual framebuffer dimensions so the UI scales to whatever // fuck you
// window/fullscreen resolution was chosen at startup. ui.init(1920, 1080);
{
int uiW = 1920, uiH = 1080;
RenderManager.GetFramebufferSize(uiW, uiH);
if (uiW < 1) uiW = 1920;
if (uiH < 1) uiH = 1080;
ui.init(uiW, uiH);
}
// storage manager is needed for the trial key check // storage manager is needed for the trial key check
StorageManager.Init(0,app.GetString(IDS_DEFAULT_SAVENAME),"savegame.dat",FIFTY_ONE_MB,&CConsoleMinecraftApp::DisplaySavingMessage,(LPVOID)&app,""); StorageManager.Init(0,app.GetString(IDS_DEFAULT_SAVENAME),"savegame.dat",FIFTY_ONE_MB,&CConsoleMinecraftApp::DisplaySavingMessage,(LPVOID)&app,"");