qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Made GIB var substitution use cvars as a last resort.

Browse source
This commit is contained in:
Brian Koropoff 2003-01-30 20:43:57 +00:00
parent b668134f25
commit 4ee0c42dcc
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libs/gib/gib_process.c
View file

@ -56,6 +56,7 @@ GIB_Process_Variable (dstring_t *token, unsigned int *i)
hashtab_t *one = GIB_DATA(cbuf_active)->locals, *two = GIB_DATA(cbuf_active)->globals; hashtab_t *one = GIB_DATA(cbuf_active)->locals, *two = GIB_DATA(cbuf_active)->globals;
unsigned int n = *i, j, k, start = *i, index = 0, len, len2; unsigned int n = *i, j, k, start = *i, index = 0, len, len2;
gib_var_t *var = 0; gib_var_t *var = 0;
cvar_t *cvar;
char c; char c;
const char *str; const char *str;
@ -97,7 +98,11 @@ GIB_Process_Variable (dstring_t *token, unsigned int *i)
str = va("%u", var->size - index); str = va("%u", var->size - index);
else else
str = var->array[index]->str; str = var->array[index]->str;
} else } else if (token->str[start] == '#')
str = "0";
else if ((cvar = Cvar_FindVar (token->str+k)))
str = cvar->string;
else
str = ""; str = "";
token->str[n] = c; token->str[n] = c;
len += n-start; len += n-start;
@ -129,6 +134,7 @@ GIB_Process_Embedded (gib_tree_t *node, cbuf_args_t *args)
{ {
unsigned int n, j; unsigned int n, j;
gib_var_t *var; gib_var_t *var;
cvar_t *cvar;
gib_tree_t *cur; gib_tree_t *cur;
unsigned int index, prev = 0; unsigned int index, prev = 0;
const char *str = node->str; const char *str = node->str;
@ -166,7 +172,10 @@ GIB_Process_Embedded (gib_tree_t *node, cbuf_args_t *args)
dstring_appendstr (args->argv[args->argc-1], var->array[index]->str); dstring_appendstr (args->argv[args->argc-1], var->array[index]->str);
else else
dasprintf (args->argv[args->argc-1], "%u", var->size - index); dasprintf (args->argv[args->argc-1], "%u", var->size - index);
} } else if (cur->delim == '#')
dstring_appendstr (args->argv[args->argc-1], "0");
else if ((cvar = Cvar_FindVar (cur->str)))
dstring_appendstr (args->argv[args->argc-1], cvar->string);
} }
if (str[prev]) if (str[prev])
dstring_appendstr (args->argv[args->argc-1], str+prev); dstring_appendstr (args->argv[args->argc-1], str+prev);