From e0f01ddae797790eb7dbe46a41c3b28db3d1141a Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 20 Feb 2026 21:55:15 +0500 Subject: [PATCH] engine: remove unused ignore_group argument from Cvar_FindVarExt --- engine/client/ref_common.c | 2 +- engine/common/cvar.c | 4 ++-- engine/common/cvar.h | 3 +-- engine/ref_api.h | 7 ++++--- ref/gl/gl_backend.c | 2 +- ref/gl/gl_studio.c | 4 ++-- ref/soft/r_studio.c | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/engine/client/ref_common.c b/engine/client/ref_common.c index 122807e9..5eea59d1 100644 --- a/engine/client/ref_common.c +++ b/engine/client/ref_common.c @@ -339,7 +339,7 @@ static const ref_api_t gEngfuncs = pfnEngineGetParm, pfnCvar_Get, - (void*)Cvar_FindVarExt, + (void*)Cvar_FindVar, Cvar_VariableValue, Cvar_VariableString, Cvar_SetValue, diff --git a/engine/common/cvar.c b/engine/common/cvar.c index 3a2683d8..e4673294 100644 --- a/engine/common/cvar.c +++ b/engine/common/cvar.c @@ -69,7 +69,7 @@ Cvar_FindVar find the specified variable by name ============ */ -convar_t *Cvar_FindVarExt( const char *var_name, int ignore_group ) +convar_t *Cvar_FindVar( const char *var_name ) { convar_t *var; @@ -91,7 +91,7 @@ convar_t *Cvar_FindVarExt( const char *var_name, int ignore_group ) // HACKHACK: HL25 compatibility if( !var && !Q_stricmp( var_name, "gl_widescreen_yfov" )) - var = Cvar_FindVarExt( "r_adjust_fov", ignore_group ); + var = Cvar_FindVar( "r_adjust_fov" ); return var; } diff --git a/engine/common/cvar.h b/engine/common/cvar.h index d60e2708..8d8f1a2d 100644 --- a/engine/common/cvar.h +++ b/engine/common/cvar.h @@ -33,8 +33,7 @@ typedef struct pending_cvar_s typedef void (*setpair_t)( const char *key, const void *value, const void *buffer, void *numpairs ); cvar_t *Cvar_GetList( void ); -#define Cvar_FindVar( name ) Cvar_FindVarExt( name, 0 ) -convar_t *Cvar_FindVarExt( const char *var_name, int ignore_group ); +convar_t *Cvar_FindVar( const char *var_name ); void Cvar_RegisterVariable( convar_t *var ); convar_t *Cvar_Get( const char *var_name, const char *value, uint32_t flags, const char *description ); convar_t *Cvar_Getf( const char *var_name, uint32_t flags, const char *description, const char *format, ... ) FORMAT_CHECK( 4 ); diff --git a/engine/ref_api.h b/engine/ref_api.h index 3adf3d85..9ecbdbb8 100644 --- a/engine/ref_api.h +++ b/engine/ref_api.h @@ -60,7 +60,8 @@ GNU General Public License for more details. // 10. Added R_GetWindowHandle to retrieve platform-specific window object. // 11. Added size argument to Mod_ProcessRenderData // 12. Added Image_CalcImageSize -#define REF_API_VERSION 12 +// 13. Removed ignore_flags argument from GetCvarPointer +#define REF_API_VERSION 13 #define TF_SKY (TF_SKYSIDE|TF_NOMIPMAP|TF_ALLOW_NEAREST) #define TF_FONT (TF_NOMIPMAP|TF_CLAMP|TF_ALLOW_NEAREST) @@ -344,7 +345,7 @@ typedef struct ref_api_s // cvar handlers cvar_t *(*Cvar_Get)( const char *szName, const char *szValue, int flags, const char *description ); - cvar_t *(*pfnGetCvarPointer)( const char *name, int ignore_flags ); + cvar_t *(*pfnGetCvarPointer)( const char *name ); float (*pfnGetCvarFloat)( const char *szName ); const char *(*pfnGetCvarString)( const char *szName ) PFN_RETURNS_NONNULL; void (*Cvar_SetValue)( const char *name, float value ); @@ -681,7 +682,7 @@ typedef int (*REFAPI)( int version, ref_interface_t *pFunctionTable, ref_api_t* #define DEFINE_ENGINE_SHARED_CVAR( x, y ) cvar_t *x = NULL; #define DECLARE_ENGINE_SHARED_CVAR( x, y ) extern cvar_t *x; #define RETRIEVE_ENGINE_SHARED_CVAR( x, y ) \ - if(!( x = gEngfuncs.pfnGetCvarPointer( #y, 0 ) )) \ + if(!( x = gEngfuncs.pfnGetCvarPointer( #y ) )) \ gEngfuncs.Host_Error( S_ERROR "engine didn't gave us %s cvar pointer\n", #y ); #define ENGINE_SHARED_CVAR_NAME( f, x, y ) f( x, y ) #define ENGINE_SHARED_CVAR( f, x ) ENGINE_SHARED_CVAR_NAME( f, x, x ) diff --git a/ref/gl/gl_backend.c b/ref/gl/gl_backend.c index 66497afc..0bdd5816 100644 --- a/ref/gl/gl_backend.c +++ b/ref/gl/gl_backend.c @@ -675,7 +675,7 @@ void R_ShowTextures( void ) time -= floor( time ); time_cubemap = gp_cl->time * 0.25f; time_cubemap -= floor( time_cubemap ); - time_cubemap *= 6.2831853f; + time_cubemap *= M_PI2_F; SinCos( time_cubemap, &cbm_sin, &cbm_cos ); gEngfuncs.Con_DrawStringLen( NULL, NULL, &charHeight ); diff --git a/ref/gl/gl_studio.c b/ref/gl/gl_studio.c index b183df32..d8298e40 100644 --- a/ref/gl/gl_studio.c +++ b/ref/gl/gl_studio.c @@ -3902,7 +3902,7 @@ static void pfnMod_LoadCacheFile( const char *path, struct cache_user_s *cu ) static cvar_t *pfnGetCvarPointer( const char *name ) { - return (cvar_t*)gEngfuncs.pfnGetCvarPointer( name, 0 ); + return (cvar_t*)gEngfuncs.pfnGetCvarPointer( name ); } static void *pfnMod_Calloc( int number, size_t size ) @@ -3979,7 +3979,7 @@ void CL_InitStudioAPI( void ) pStudioDraw = &gStudioDraw; // trying to grab them from client.dll - cl_righthand = gEngfuncs.pfnGetCvarPointer( "cl_righthand", 0 ); + cl_righthand = gEngfuncs.pfnGetCvarPointer( "cl_righthand" ); // Xash will be used internal StudioModelRenderer if( gEngfuncs.pfnGetStudioModelInterface( STUDIO_INTERFACE_VERSION, &pStudioDraw, &gStudioAPI )) diff --git a/ref/soft/r_studio.c b/ref/soft/r_studio.c index d24a2069..6437a0ac 100644 --- a/ref/soft/r_studio.c +++ b/ref/soft/r_studio.c @@ -3527,7 +3527,7 @@ static void pfnMod_LoadCacheFile( const char *path, struct cache_user_s *cu ) static cvar_t *pfnGetCvarPointer( const char *name ) { - return (cvar_t *)gEngfuncs.pfnGetCvarPointer( name, 0 ); + return (cvar_t *)gEngfuncs.pfnGetCvarPointer( name ); } static void *pfnMod_Calloc( int number, size_t size ) @@ -3604,7 +3604,7 @@ void GAME_EXPORT CL_InitStudioAPI( void ) pStudioDraw = &gStudioDraw; // trying to grab them from client.dll - cl_righthand = gEngfuncs.pfnGetCvarPointer( "cl_righthand", 0 ); + cl_righthand = gEngfuncs.pfnGetCvarPointer( "cl_righthand" ); // Xash will be used internal StudioModelRenderer if( gEngfuncs.pfnGetStudioModelInterface( STUDIO_INTERFACE_VERSION, &pStudioDraw, &gStudioAPI ))