RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: enable warning when client or server tries to access non-existent cvar

Browse Source
This commit is contained in:
SNMetamorph
2026-05-24 16:29:28 +04:00
committed by a1batross
parent 33cd20b21b
commit fe9b8bcaca
4 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine/client/dll_int/cl_game.c
View File

@@ -3568,6 +3568,16 @@ static void GAME_EXPORT VGui_ViewportPaintBackground( int extents[4] )
// stub
}
static cvar_t* GAME_EXPORT CL_CvarGetPointer( const char *szVarName )
{
cvar_t *result = (cvar_t *)Cvar_FindVar( szVarName );
if( !result )
Con_DPrintf( S_WARN "%s: client tried to get non-existent cvar \"%s\"\n", __func__, szVarName );
return result;
}
// shared between client and server
triangleapi_t gTriApi;
@@ -3790,7 +3800,7 @@ static cl_enginefunc_t gEngfuncs =
pfnHookEvent,
Con_Visible,
pfnGetGameDirectory,
pfnCVarGetPointer,
CL_CvarGetPointer,
Key_LookupBinding,
pfnGetLevelName,
pfnGetScreenFade,
@@ -3924,7 +3934,7 @@ static engine_studio_api_t gStudioAPI =
.Mod_ForName = pfnStudio_Mod_ForName,
.Mod_Extradata = pfnStudio_Mod_Extradata,
.GetModelByIndex = CL_ModelHandle,
.GetCvar = pfnCVarGetPointer,
.GetCvar = CL_CvarGetPointer,
.GetChromeSprite = pfnStudio_GetChromeSprite,
.GetAliasScale = pfnStudio_GetAliasScale,
.StudioGetAliasTransform = pfnStudio_GetAliasTransform,

12
engine/common/common.c
View File

@@ -685,18 +685,6 @@ void GAME_EXPORT pfnGetModelBounds( model_t *mod, float *mins, float *maxs )
}
}
/*
=============
pfnCVarGetPointer
can return NULL
=============
*/
cvar_t *GAME_EXPORT pfnCVarGetPointer( const char *szVarName )
{
return (cvar_t *)Cvar_FindVar( szVarName );
}
/*
=============
pfnCompareFileTime

1
engine/common/common.h
View File

@@ -634,7 +634,6 @@ byte COM_Nibble( char c );
int COM_SaveFile( const char *filename, const void *data, int len );
byte *COM_LoadFileForMe( const char *filename, int *pLength ) MALLOC_LIKE( free, 1 );
qboolean COM_IsSafeFileToDownload( const char *filename );
cvar_t *pfnCVarGetPointer( const char *szVarName );
int pfnDrawConsoleString( int x, int y, char *string );
void pfnDrawSetTextColor( float r, float g, float b );
void pfnDrawConsoleStringLen( const char *pText, int *length, int *height );

12
engine/server/sv_game.c
View File

@@ -4680,6 +4680,16 @@ static void GAME_EXPORT pfnGetGameDir( char *out )
}
}
static cvar_t* GAME_EXPORT SV_CvarGetPointer( const char *szVarName )
{
cvar_t *result = (cvar_t *)Cvar_FindVar( szVarName );
if( !result )
Con_DPrintf( S_WARN "%s: server tried to get non-existent cvar \"%s\"\n", __func__, szVarName );
return result;
}
// engine callbacks
static enginefuncs_t gEngfuncs =
{
@@ -4799,7 +4809,7 @@ static enginefuncs_t gEngfuncs =
pfnGetPlayerUserId,
pfnBuildSoundMsg,
pfnIsDedicatedServer,
pfnCVarGetPointer,
SV_CvarGetPointer,
pfnGetPlayerWONId,
(void*)Info_RemoveKey,
pfnGetPhysicsKeyValue,