From cb43df43ef54ff13a1e492aba445f83a71b78695 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 24 May 2023 03:51:13 +0300 Subject: [PATCH] engine: common: cvar: do not check if cvar was registered in DirectSet when it has valid next pointer --- engine/common/cvar.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/common/cvar.c b/engine/common/cvar.c index 657a1dc7..52cc9bb7 100644 --- a/engine/common/cvar.c +++ b/engine/common/cvar.c @@ -681,18 +681,18 @@ void Cvar_DirectSet( convar_t *var, const char *value ) { const char *pszValue; - if( !var ) return; // ??? + if( unlikely( !var )) return; // ??? // lookup for registration - if( CVAR_CHECK_SENTINEL( var ) || ( var->next == NULL && !FBitSet( var->flags, FCVAR_EXTENDED|FCVAR_ALLOCATED ))) + if( unlikely( CVAR_CHECK_SENTINEL( var ) || ( var->next == NULL && !FBitSet( var->flags, FCVAR_EXTENDED|FCVAR_ALLOCATED )))) { // need to registering cvar fisrt Cvar_RegisterVariable( var ); // ok, register it - } - // lookup for registration again - if( var != Cvar_FindVar( var->name )) - return; // how this possible? + // lookup for registration again + if( var != Cvar_FindVar( var->name )) + return; // how this possible? + } if( FBitSet( var->flags, FCVAR_READ_ONLY )) {