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: expect that base_cmd is consistent, as for many years no cases of broken basecmd were found

Browse Source
This commit is contained in:
Alibek Omarov
2025-05-25 16:48:31 +05:00
parent 9c6f12f31c
commit c3531b6499
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
engine/common/cmd.c
View File

@@ -958,21 +958,20 @@ static void Cmd_ExecuteStringWithPrivilegeCheck( const char *text, qboolean isPr
if( !Cmd_Argc( )) return; // no tokens
#if defined(XASH_HASHED_VARS)
#if defined( XASH_HASHED_VARS )
BaseCmd_FindAll( cmd_argv[0], &cmd, &a, &cvar );
#endif
if( !host.apply_game_config )
{
#if !defined( XASH_HASHED_VARS )
// check aliases
if( !a ) // if not found in basecmd
for( a = cmd_alias; a; a = a->next )
{
for( a = cmd_alias; a; a = a->next )
{
if( !Q_stricmp( cmd_argv[0], a->name ))
break;
}
if( !Q_stricmp( cmd_argv[0], a->name ))
break;
}
#endif
if( a )
{
@@ -987,14 +986,13 @@ static void Cmd_ExecuteStringWithPrivilegeCheck( const char *text, qboolean isPr
// special mode for restore game.dll archived cvars
if( !host.apply_game_config || !Q_strcmp( cmd_argv[0], "exec" ))
{
if( !cmd || !cmd->function ) // if not found in basecmd
#if !defined( XASH_HASHED_VARS )
for( cmd = cmd_functions; cmd; cmd = cmd->next )
{
for( cmd = cmd_functions; cmd; cmd = cmd->next )
{
if( !Q_stricmp( cmd_argv[0], cmd->name ) && cmd->function )
break;
}
if( !Q_stricmp( cmd_argv[0], cmd->name ) && cmd->function )
break;
}
#endif
// check functions
if( cmd && cmd->function )

6
engine/common/cvar.c
View File

@@ -1030,9 +1030,11 @@ qboolean Cvar_CommandWithPrivilegeCheck( convar_t *v, qboolean isPrivileged )
return true;
}
#if !defined( XASH_HASHED_VARS )
// check variables
if( !v ) // already found in basecmd
v = Cvar_FindVar( Cmd_Argv( 0 ));
v = Cvar_FindVar( Cmd_Argv( 0 ));
#endif
if( !v )
return false;