Merge branch 'master' into Cloudwalk/cvar_overhaul

[xonotic/darkplaces.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index abc512eef3a4e547ba72e24e07e1aaad43cbe961..3ff1d5f0e59e7415c83ed9421a851acd0410bd05 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -925,6 +925,7 @@ static void Cmd_Toggle_f(cmd_state_t *cmd)
        { // Correct Arguments Specified
                // Acquire Potential CVar
                cvar_t* cvCVar = Cvar_FindVar(cmd->cvars, Cmd_Argv(cmd, 1), cmd->cvars_flagsmask);
+               cvCVar = cvCVar->parent ? cvCVar->parent : cvCVar;
 
                if(cvCVar != NULL)
                { // Valid CVar
@@ -1173,7 +1174,7 @@ static const char *Cmd_GetDirectCvarValue(cmd_state_t *cmd, const char *varname,
        }
 
        if((cvar = Cvar_FindVar(cmd->cvars, varname, cmd->cvars_flagsmask)) && !(cvar->flags & CF_PRIVATE))
-               return cvar->string;
+               return cvar->parent ? cvar->parent->string : cvar->string;
 
        return NULL;
 }
@@ -1579,24 +1580,15 @@ static void Cmd_Apropos_f(cmd_state_t *cmd)
                partial = va(vabuf, sizeof(vabuf), "*%s*", partial);
 
        count = 0;
-       for (cvar = cmd->cvars->vars; cvar; cvar = cvar->next)
+       List_For_Each_Entry(cvar, &cmd->cvars->vars->list, list)
        {
                if (matchpattern_with_separator(cvar->name, partial, true, "", false) ||
                    matchpattern_with_separator(cvar->description, partial, true, "", false))
                {
                        Con_Printf ("cvar ");
-                       Cvar_PrintHelp(cvar, cvar->name, true);
+                       Cvar_PrintHelp(cvar->parent ? cvar->parent : cvar, cvar->name, true);
                        count++;
                }
-               for (char **cvar_alias = cvar->aliases; cvar_alias && *cvar_alias; cvar_alias++)
-               {
-                       if (matchpattern_with_separator(*cvar_alias, partial, true, "", false))
-                       {
-                               Con_Printf ("cvar ");
-                               Cvar_PrintHelp(cvar, *cvar_alias, true);
-                               count++;
-                       }
-               }
        }
        for (func = cmd->userdefined->qc_functions; func; func = func->next)
        {
@@ -1636,6 +1628,9 @@ static cmd_state_t *Cmd_AddInterpreter(cmd_buf_t *cbuf, cvar_state_t *cvars, int
        cmd->null_string = "";
 
        cmd->cvars = cvars;
+       cmd->cvars->mempool = Mem_AllocPool("cvars", 0, NULL);
+       cmd->cvars->vars = (cvar_t *)Mem_Alloc(cmd->cvars->mempool, sizeof(cvar_t));
+       cmd->cvars->vars->list.next = cmd->cvars->vars->list.prev = &cmd->cvars->vars->list;
        cmd->cvars_flagsmask = cvars_flagsmask;
        cmd->cmd_flags = cmds_flagsmask;
        cmd->userdefined = userdefined;