fixed some issues with how D3D=1 worked in the makefile

[xonotic/darkplaces.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index 80e810a532561e7dfa2431d0c1e8be571dd3f24c..995473c6e6936a60695b13e8b1ac06d5fd28e1e9 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -857,6 +857,7 @@ static const char *Cmd_GetCvarValue(const char *var, size_t varlen, cmdalias_t *
        static char varval[MAX_INPUTLINE];
        const char *varstr;
        char *varfunc;
+static char asis[] = "asis"; // just to suppress const char warnings
 
        if(varlen >= MAX_INPUTLINE)
                varlen = MAX_INPUTLINE - 1;
@@ -887,7 +888,7 @@ static const char *Cmd_GetCvarValue(const char *var, size_t varlen, cmdalias_t *
                varstr = Cmd_GetDirectCvarValue(varname, alias, &is_multiple);
                if(is_multiple)
                        if(!varfunc)
-                               varfunc = "asis";
+                               varfunc = asis;
        }
 
        if(!varstr)
@@ -1145,10 +1146,11 @@ static void Cmd_Apropos_f(void)
        }
        for (alias = cmd_alias; alias; alias = alias->next)
        {
+               // procede here a bit differently as an alias value always got a final \n
                if (!matchpattern_with_separator(alias->name, partial, true, "", false))
-               if (!matchpattern_with_separator(alias->value, partial, true, "", false))
+               if (!matchpattern_with_separator(alias->value, partial, true, "\n", false)) // when \n is as separator wildcards don't match it
                        continue;
-               Con_Printf("alias ^5%s^7: %s", alias->name, alias->value);
+               Con_Printf("alias ^5%s^7: %s", alias->name, alias->value); // do not print an extra \n
                count++;
        }
        Con_Printf("%i result%s\n\n", count, (count > 1) ? "s" : "");