YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-02-09 05:34:22 +00:00
Code Issues Projects Releases Wiki Activity

engine: common: static-ize common.c functions, set GAME_EXPORT to API functions

Browse Source
This commit is contained in:
Alibek Omarov 2023-06-20 14:19:44 +03:00
parent 5a4c443c79
commit 7e06d049f5
4 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engine/client/cl_game.c
View File

@ -1685,6 +1685,22 @@ static void GAME_EXPORT pfnSetCrosshair( HSPRITE hspr, wrect_t rc, int r, int g,
clgame.ds.rcCrosshair = rc; clgame.ds.rcCrosshair = rc;
} }
/*
=============
pfnCvar_RegisterVariable
=============
*/
static cvar_t *GAME_EXPORT pfnCvar_RegisterClientVariable( const char *szName, const char *szValue, int flags )
{
// a1ba: try to mitigate outdated client.dll vulnerabilities
if( !Q_stricmp( szName, "motdfile" ))
flags |= FCVAR_PRIVILEGED;
return (cvar_t *)Cvar_Get( szName, szValue, flags|FCVAR_CLIENTDLL, Cvar_BuildAutoDescription( szName, flags|FCVAR_CLIENTDLL ));
}
/* /*
============= =============
pfnHookUserMsg pfnHookUserMsg

11
engine/client/cl_gameui.c
View File

@ -642,6 +642,17 @@ static void GAME_EXPORT pfnFillRGBA( int x, int y, int width, int height, int r,
ref.dllFuncs.Color4ub( 255, 255, 255, 255 ); ref.dllFuncs.Color4ub( 255, 255, 255, 255 );
} }
/*
=============
pfnCvar_RegisterVariable
=============
*/
static cvar_t *GAME_EXPORT pfnCvar_RegisterGameUIVariable( const char *szName, const char *szValue, int flags )
{
return (cvar_t *)Cvar_Get( szName, szValue, flags|FCVAR_GAMEUIDLL, Cvar_BuildAutoDescription( szName, flags|FCVAR_GAMEUIDLL ));
}
/* /*
============= =============
pfnClientCmd pfnClientCmd

38
engine/common/common.c
View File

@ -104,7 +104,7 @@ static float fran1( void )
return temp; return temp;
} }
void COM_SetRandomSeed( int lSeed ) void GAME_EXPORT COM_SetRandomSeed( int lSeed )
{ {
if( lSeed ) idum = lSeed; if( lSeed ) idum = lSeed;
else idum = -time( NULL ); else idum = -time( NULL );
@ -267,7 +267,7 @@ static void LZSS_BuildHash( lzss_state_t *state, const byte *source )
list->start = node; list->start = node;
} }
byte *LZSS_CompressNoAlloc( lzss_state_t *state, byte *pInput, int input_length, byte *pOutputBuf, uint *pOutputSize ) static byte *LZSS_CompressNoAlloc( lzss_state_t *state, byte *pInput, int input_length, byte *pOutputBuf, uint *pOutputSize )
{ {
byte *pStart = pOutputBuf; // allocate the output buffer, compressed buffer is expected to be less, caller will free byte *pStart = pOutputBuf; // allocate the output buffer, compressed buffer is expected to be less, caller will free
byte *pEnd = pStart + input_length - sizeof( lzss_header_t ) - 8; // prevent compression failure byte *pEnd = pStart + input_length - sizeof( lzss_header_t ) - 8; // prevent compression failure
@ -613,7 +613,7 @@ COM_Nibble
Returns the 4 bit nibble for a hex character Returns the 4 bit nibble for a hex character
================== ==================
*/ */
byte COM_Nibble( char c ) static byte COM_Nibble( char c )
{ {
if(( c >= '0' ) && ( c <= '9' )) if(( c >= '0' ) && ( c <= '9' ))
{ {
@ -715,7 +715,7 @@ Cache_Check
consistency check consistency check
==================== ====================
*/ */
void *Cache_Check( poolhandle_t mempool, cache_user_t *c ) void *GAME_EXPORT Cache_Check( poolhandle_t mempool, cache_user_t *c )
{ {
if( !c->data ) if( !c->data )
return NULL; return NULL;
@ -732,7 +732,7 @@ COM_LoadFileForMe
============= =============
*/ */
byte* GAME_EXPORT COM_LoadFileForMe( const char *filename, int *pLength ) byte *GAME_EXPORT COM_LoadFileForMe( const char *filename, int *pLength )
{ {
string name; string name;
byte *file, *pfile; byte *file, *pfile;
@ -858,32 +858,6 @@ void GAME_EXPORT pfnGetModelBounds( model_t *mod, float *mins, float *maxs )
} }
} }
/*
=============
pfnCvar_RegisterVariable
=============
*/
cvar_t *pfnCvar_RegisterClientVariable( const char *szName, const char *szValue, int flags )
{
// a1ba: try to mitigate outdated client.dll vulnerabilities
if( !Q_stricmp( szName, "motdfile" ))
flags |= FCVAR_PRIVILEGED;
return (cvar_t *)Cvar_Get( szName, szValue, flags|FCVAR_CLIENTDLL, Cvar_BuildAutoDescription( szName, flags|FCVAR_CLIENTDLL ));
}
/*
=============
pfnCvar_RegisterVariable
=============
*/
cvar_t *pfnCvar_RegisterGameUIVariable( const char *szName, const char *szValue, int flags )
{
return (cvar_t *)Cvar_Get( szName, szValue, flags|FCVAR_GAMEUIDLL, Cvar_BuildAutoDescription( szName, flags|FCVAR_GAMEUIDLL ));
}
/* /*
============= =============
pfnCVarGetPointer pfnCVarGetPointer
@ -891,7 +865,7 @@ pfnCVarGetPointer
can return NULL can return NULL
============= =============
*/ */
cvar_t *pfnCVarGetPointer( const char *szVarName ) cvar_t *GAME_EXPORT pfnCVarGetPointer( const char *szVarName )
{ {
return (cvar_t *)Cvar_FindVar( szVarName ); return (cvar_t *)Cvar_FindVar( szVarName );
} }

2
engine/common/common.h
View File

@ -626,8 +626,6 @@ qboolean SV_Active( void );
============================================================== ==============================================================
*/ */
cvar_t *pfnCvar_RegisterClientVariable( const char *szName, const char *szValue, int flags );
cvar_t *pfnCvar_RegisterGameUIVariable( const char *szName, const char *szValue, int flags );
char *COM_MemFgets( byte *pMemFile, int fileSize, int *filePos, char *pBuffer, int bufferSize ); char *COM_MemFgets( byte *pMemFile, int fileSize, int *filePos, char *pBuffer, int bufferSize );
void COM_HexConvert( const char *pszInput, int nInputLength, byte *pOutput ); void COM_HexConvert( const char *pszInput, int nInputLength, byte *pOutput );
int COM_SaveFile( const char *filename, const void *data, int len ); int COM_SaveFile( const char *filename, const void *data, int len );