engine: common: made a filter for a filter (lol), so it's possible to play selected games with cl_filterstuffcmd enabled

engine/common/cvar.c

@@ -21,6 +21,29 @@ GNU General Public License for more details.
 convar_t	*cvar_vars = NULL; // head of list
 convar_t	*cmd_scripting;
 
+#ifdef HACKS_RELATED_HLMODS
+typedef struct cvar_filter_quirks_s
+{
+	const char *gamedir; // gamedir to enable for
+	const char *cvars; // list of cvars should be excluded from filter
+} cvar_filter_quirks_t;
+
+static cvar_filter_quirks_t cvar_filter_quirks[] =
+{
+	// EXAMPLE:
+	//{
+	//	"valve",
+	//	"test;test1;test100"
+	//},
+	{
+		"ricochet",
+		"r_drawviewmodel",
+	},
+};
+
+static cvar_filter_quirks_t *cvar_active_filter_quirks = NULL;
+#endif
+
 CVAR_DEFINE_AUTO( cl_filterstuffcmd, "1", FCVAR_ARCHIVE | FCVAR_PRIVILEGED, "filter commands coming from server" );
 
 /*
@@ -902,6 +925,39 @@ static qboolean Cvar_ShouldSetCvar( convar_t *v, qboolean isPrivileged )
 	if( cl_filterstuffcmd.value <= 0.0f )
 		return true;
 
+#ifdef HACKS_RELATED_HLMODS
+	// check if game-specific filter exceptions should be applied
+	// TODO: for cmd exceptions, make generic function
+	if( cvar_active_filter_quirks )
+	{
+		const char *cur, *next;
+
+		cur = cvar_active_filter_quirks->cvars;
+		next = Q_strchr( cur, ';' );
+
+		// TODO: implement Q_strchrnul
+		while( cur && *cur )
+		{
+			size_t len = next ? next - cur : Q_strlen( cur );
+
+			// found, quit
+			if( !Q_strnicmp( cur, v->name, len ))
+				return true;
+
+			if( next )
+			{
+				cur = next + 1;
+				next = Q_strchr( cur, ';' );
+			}
+			else
+			{
+				// stop
+				cur = NULL;
+			}
+		}
+	}
+#endif
+
 	if( FBitSet( v->flags, FCVAR_FILTERABLE ))
 		return false;
 
@@ -1157,6 +1213,7 @@ Reads in all archived cvars
 void Cvar_Init( void )
 {
 	cvar_vars = NULL;
+	cvar_active_filter_quirks = NULL;
 	cmd_scripting = Cvar_Get( "cmd_scripting", "0", FCVAR_ARCHIVE|FCVAR_PRIVILEGED, "enable simple condition checking and variable operations" );
 	Cvar_RegisterVariable( &host_developer ); // early registering for dev
 	Cvar_RegisterVariable( &cl_filterstuffcmd );
@@ -1167,6 +1224,26 @@ void Cvar_Init( void )
 	Cmd_AddCommand( "cvarlist", Cvar_List_f, "display all console variables beginning with the specified prefix" );
 }
 
+/*
+============
+Cvar_PostFSInit
+
+============
+*/
+void Cvar_PostFSInit( void )
+{
+	int i;
+
+	for( i = 0; i < ARRAYSIZE( cvar_filter_quirks ); i++ )
+	{
+		if( !Q_stricmp( cvar_filter_quirks[i].gamedir, GI->gamefolder ))
+		{
+			cvar_active_filter_quirks = &cvar_filter_quirks[i];
+			break;
+		}
+	}
+}
+
 #if XASH_ENGINE_TESTS
 #include "tests.h"
 

engine/common/cvar.h

@@ -78,6 +78,7 @@ void Cvar_Reset( const char *var_name );
 void Cvar_SetCheatState( void );
 qboolean Cvar_CommandWithPrivilegeCheck( convar_t *v, qboolean isPrivileged );
 void Cvar_Init( void );
+void Cvar_PostFSInit( void );
 void Cvar_Unlink( int group );
 
 #endif//CVAR_H

engine/common/host.c

@@ -1067,6 +1067,7 @@ void Host_InitCommon( int argc, char **argv, const char *progname, qboolean bCha
 #endif
 
 	FS_LoadGameInfo( NULL );
+	Cvar_PostFSInit();
 
 	if( FS_FileExists( va( "%s.rc", SI.basedirName ), false ))
 		Q_strncpy( SI.rcName, SI.basedirName, sizeof( SI.rcName ));	// e.g. valve.rc