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: add function Cvar_DirectFullSet that acts like Cvar_DirectSet and Cvar_FullSet at the same time

Browse Source
This commit is contained in:
Alibek Omarov
2026-01-29 22:03:17 +05:00
parent e767770647
commit 9cc884dfe6
2 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
engine/common/cvar.c
View File

@@ -598,6 +598,42 @@ static qboolean Cvar_CanSet( const convar_t *cv )
return true;
}
/*
============
Cvar_DirectFullSet
can set any protected cvars
============
*/
void Cvar_DirectFullSet( convar_t *var, const char *value, uint32_t flags )
{
size_t len = Q_strlen( value ) + 1;
var->string = Mem_Realloc( cvar_pool, var->string, len );
Q_strncpy( var->string, value, len );
var->value = Q_atof( var->string );
SetBits( var->flags, flags );
// tell engine about changes
Cvar_Changed( var );
}
static void Cvar_SanitizeAndSet( convar_t *var, const char *value )
{
const char *fixed_string = Cvar_ValidateString( var, value );
// nothing to change
if( !Q_strcmp( fixed_string, var->string ))
return;
// fill it cls.userinfo, svs.serverinfo
if( !Cvar_UpdateInfo( var, fixed_string, true ))
return;
// and finally change the cvar itself
Cvar_DirectFullSet( var, fixed_string, var->flags );
}
/*
============
Cvar_Set2
@@ -608,8 +644,6 @@ static convar_t *Cvar_Set2( const char *var_name, const char *value )
convar_t *var;
qboolean dll_variable = false;
qboolean force = false;
const char *fixed_string;
size_t fixed_string_len;
if( !Cvar_ValidateVarName( var_name, false ))
{
@@ -673,24 +707,7 @@ static convar_t *Cvar_Set2( const char *var_name, const char *value )
return var;
}
fixed_string = Cvar_ValidateString( var, value );
// nothing to change
if( !Q_strcmp( fixed_string, var->string ))
return var;
// fill it cls.userinfo, svs.serverinfo
if( !Cvar_UpdateInfo( var, fixed_string, true ))
return var;
// and finally change the cvar itself
fixed_string_len = Q_strlen( fixed_string ) + 1;
var->string = Mem_Realloc( cvar_pool, var->string, fixed_string_len );
Q_strncpy( var->string, fixed_string, fixed_string_len );
var->value = Q_atof( var->string );
// tell engine about changes
Cvar_Changed( var );
Cvar_SanitizeAndSet( var, value );
return var;
}
@@ -703,9 +720,6 @@ way to change value for many cvars
*/
void GAME_EXPORT Cvar_DirectSet( convar_t *var, const char *value )
{
const char *fixed_string;
size_t fixed_string_len;
if( unlikely( !var )) return; // ???
// lookup for registration
@@ -734,24 +748,7 @@ void GAME_EXPORT Cvar_DirectSet( convar_t *var, const char *value )
value = var->def_string; // reset to default value
}
fixed_string = Cvar_ValidateString( var, value );
// nothing to change
if( !Q_strcmp( fixed_string, var->string ))
return;
// fill it cls.userinfo, svs.serverinfo
if( !Cvar_UpdateInfo( var, fixed_string, true ))
return;
// and finally change the cvar itself
fixed_string_len = Q_strlen( fixed_string ) + 1;
var->string = Mem_Realloc( cvar_pool, var->string, fixed_string_len );
Q_strncpy( var->string, fixed_string, fixed_string_len );
var->value = Q_atof( var->string );
// tell engine about changes
Cvar_Changed( var );
Cvar_SanitizeAndSet( var, value );
}
/*
@@ -782,7 +779,6 @@ can set any protected cvars
void Cvar_FullSet( const char *var_name, const char *value, uint32_t flags )
{
convar_t *var = Cvar_FindVar( var_name );
size_t len = Q_strlen( value ) + 1;
if( !var )
{
@@ -790,13 +786,7 @@ void Cvar_FullSet( const char *var_name, const char *value, uint32_t flags )
return;
}
var->string = Mem_Realloc( cvar_pool, var->string, len );
Q_strncpy( var->string, value, len );
var->value = Q_atof( var->string );
SetBits( var->flags, flags );
// tell engine about changes
Cvar_Changed( var );
Cvar_DirectFullSet( var, value, var->flags );
}
/*

1
engine/common/cvar.h
View File

@@ -42,6 +42,7 @@ void Cvar_LookupVars( int checkbit, void *buffer, void *ptr, setpair_t callback
void Cvar_FullSet( const char *var_name, const char *value, uint32_t flags );
void Cvar_DirectSet( convar_t *var, const char *value );
void Cvar_DirectSetValue( convar_t *var, float value );
void Cvar_DirectFullSet( convar_t *var, const char *value, uint32_t flags );
void Cvar_Set( const char *var_name, const char *value );
void Cvar_SetValue( const char *var_name, float value );
const char *Cvar_BuildAutoDescription( const char *szName, uint32_t flags ) RETURNS_NONNULL;