YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

engine: client: cl_scrn: minor refactoring

Browse Source
This commit is contained in:
Alibek Omarov 2022-12-30 01:58:26 +03:00
parent e5b32fe8ac
commit eb7eb4acbc
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engine/client/cl_scrn.c
View File

@ -577,7 +577,7 @@ void SCR_UpdateScreen( void )
V_PostRender(); V_PostRender();
} }
qboolean SCR_LoadFixedWidthFont( const char *fontname ) static qboolean SCR_LoadFixedWidthFont( const char *fontname )
{ {
int i, fontWidth; int i, fontWidth;
@ -606,7 +606,7 @@ qboolean SCR_LoadFixedWidthFont( const char *fontname )
return true; return true;
} }
qboolean SCR_LoadVariableWidthFont( const char *fontname ) static qboolean SCR_LoadVariableWidthFont( const char *fontname )
{ {
int i, fontWidth; int i, fontWidth;
byte *buffer; byte *buffer;
@ -657,21 +657,28 @@ INTERNAL RESOURCE
*/ */
void SCR_LoadCreditsFont( void ) void SCR_LoadCreditsFont( void )
{ {
const char *path = "gfx/creditsfont.fnt"; qboolean success = false;
dword crc; dword crc = 0;
// replace default gfx.wad textures by current charset's font // replace default gfx.wad textures by current charset's font
if( !CRC32_File( &crc, "gfx.wad" ) || crc == 0x49eb9f16 ) if( !CRC32_File( &crc, "gfx.wad" ) || crc == 0x49eb9f16 )
{ {
const char *path2 = va("creditsfont_%s.fnt", Cvar_VariableString( "con_charset" ) ); string charsetFnt;
if( FS_FileExists( path2, false ) )
path = path2; if( Q_snprintf( charsetFnt, sizeof( charsetFnt ),
"creditsfont_%s.fnt", Cvar_VariableString( "con_charset" )) > 0 )
{
if( FS_FileExists( charsetFnt, false ))
success = SCR_LoadVariableWidthFont( charsetFnt );
}
} }
if( !SCR_LoadVariableWidthFont( path )) if( !success && !SCR_LoadVariableWidthFont( "gfx/creditsfont.fnt" ))
{ {
if( !SCR_LoadFixedWidthFont( "gfx/conchars" )) if( !SCR_LoadFixedWidthFont( "gfx/conchars" ))
{
Con_DPrintf( S_ERROR "failed to load HUD font\n" ); Con_DPrintf( S_ERROR "failed to load HUD font\n" );
}
} }
} }