YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-02-06 12:14:15 +00:00
Code Issues Projects Releases Wiki Activity

engine: client: add cl_logoext cvar that's used by mainui to tell the engine which logo must be packed

Browse Source
This commit is contained in:
Alibek Omarov 2022-12-01 05:50:28 +03:00
parent f30f23ba51
commit cbe3e608b6
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
engine/client/cl_main.c
View File

@ -38,6 +38,7 @@ CVAR_DEFINE_AUTO( cl_allow_upload, "1", FCVAR_ARCHIVE, "allow to uploading resou
CVAR_DEFINE_AUTO( cl_download_ingame, "1", FCVAR_ARCHIVE, "allow to downloading resources while client is active" ); CVAR_DEFINE_AUTO( cl_download_ingame, "1", FCVAR_ARCHIVE, "allow to downloading resources while client is active" );
CVAR_DEFINE_AUTO( cl_logofile, "lambda", FCVAR_ARCHIVE, "player logo name" ); CVAR_DEFINE_AUTO( cl_logofile, "lambda", FCVAR_ARCHIVE, "player logo name" );
CVAR_DEFINE_AUTO( cl_logocolor, "orange", FCVAR_ARCHIVE, "player logo color" ); CVAR_DEFINE_AUTO( cl_logocolor, "orange", FCVAR_ARCHIVE, "player logo color" );
CVAR_DEFINE_AUTO( cl_logoext, "bmp", FCVAR_ARCHIVE, "temporary cvar to tell engine which logo must be packed" );
CVAR_DEFINE_AUTO( cl_test_bandwidth, "1", FCVAR_ARCHIVE, "test network bandwith before connection" ); CVAR_DEFINE_AUTO( cl_test_bandwidth, "1", FCVAR_ARCHIVE, "test network bandwith before connection" );
convar_t *rcon_client_password; convar_t *rcon_client_password;
convar_t *rcon_address; convar_t *rcon_address;
@ -1206,7 +1207,7 @@ resource_t *CL_AddResource( resourcetype_t type, const char *name, int size, qbo
void CL_CreateResourceList( void ) void CL_CreateResourceList( void )
{ {
char szFileName[MAX_OSPATH]; char szFileName[MAX_OSPATH];
byte rgucMD5_hash[16]; byte rgucMD5_hash[16];
resource_t *pNewResource; resource_t *pNewResource;
int nSize; int nSize;
@ -1214,30 +1215,36 @@ void CL_CreateResourceList( void )
HPAK_FlushHostQueue(); HPAK_FlushHostQueue();
cl.num_resources = 0; cl.num_resources = 0;
Q_snprintf( szFileName, sizeof( szFileName ), "logos/remapped.bmp" );
memset( rgucMD5_hash, 0, sizeof( rgucMD5_hash )); memset( rgucMD5_hash, 0, sizeof( rgucMD5_hash ));
// sanitize cvar value
if( Q_strcmp( cl_logoext.string, "bmp" ) &&
Q_strcmp( cl_logoext.string, "png" ))
Cvar_DirectSet( &cl_logoext, "bmp" );
Q_snprintf( szFileName, sizeof( szFileName ),
"logos/remapped.%s", cl_logoext.string );
fp = FS_Open( szFileName, "rb", true ); fp = FS_Open( szFileName, "rb", true );
if( fp ) if( !fp )
return;
MD5_HashFile( rgucMD5_hash, szFileName, NULL );
nSize = FS_FileLength( fp );
if( nSize != 0 )
{ {
MD5_HashFile( rgucMD5_hash, szFileName, NULL ); pNewResource = CL_AddResource( t_decal, szFileName, nSize, false, 0 );
nSize = FS_FileLength( fp );
if( nSize != 0 ) if( pNewResource )
{ {
pNewResource = CL_AddResource( t_decal, szFileName, nSize, false, 0 ); SetBits( pNewResource->ucFlags, RES_CUSTOM );
memcpy( pNewResource->rgucMD5_hash, rgucMD5_hash, 16 );
if( pNewResource ) HPAK_AddLump( false, CUSTOM_RES_PATH, pNewResource, NULL, fp );
{
SetBits( pNewResource->ucFlags, RES_CUSTOM );
memcpy( pNewResource->rgucMD5_hash, rgucMD5_hash, 16 );
HPAK_AddLump( false, CUSTOM_RES_PATH, pNewResource, NULL, fp );
}
} }
FS_Close( fp );
} }
FS_Close( fp );
} }
/* /*
@ -2861,6 +2868,7 @@ void CL_InitLocal( void )
Cvar_RegisterVariable( &cl_download_ingame ); Cvar_RegisterVariable( &cl_download_ingame );
Cvar_RegisterVariable( &cl_logofile ); Cvar_RegisterVariable( &cl_logofile );
Cvar_RegisterVariable( &cl_logocolor ); Cvar_RegisterVariable( &cl_logocolor );
Cvar_RegisterVariable( &cl_logoext );
Cvar_RegisterVariable( &cl_test_bandwidth ); Cvar_RegisterVariable( &cl_test_bandwidth );
Voice_RegisterCvars(); Voice_RegisterCvars();