qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-08 15:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

1. Cvar_CvarList_f() prints cvar flags (like Q2/Q3 do)

Browse source 
2. CVAR_HEAP makes no sense now that ALL cvar are stored in heap.
3. No need to allocate memory for cvar descriptions
4. ^= CVAR_USER_CREATED ---> &= ~CVAR_USER_CREATED
This commit is contained in:
Anton E. Gavrilov 2000-09-22 15:32:52 +00:00
parent 1a3eb27f8b
commit c85a468602
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/cvar.c
View file

@ -311,7 +311,7 @@ void Cvar_Set_f(void)
} }
else else
{ {
var = Cvar_Get (var_name, value, CVAR_USER_CREATED|CVAR_HEAP, var = Cvar_Get (var_name, value, CVAR_USER_CREATED,
"User created cvar"); "User created cvar");
} }
} }
@ -393,9 +393,13 @@ void Cvar_CvarList_f (void)
int i; int i;
for (var=cvar_vars, i=0 ; var ; var=var->next, i++) for (var=cvar_vars, i=0 ; var ; var=var->next, i++)
{ Con_Printf("%c%c%c %s\n",
Con_Printf("%s\n",var->name); var->flags & CVAR_ARCHIVE ? '*' : ' ',
} var->flags & CVAR_USERINFO ? 'u' : ' ',
var->flags & CVAR_SERVERINFO ? 's' : ' ',
var->name);
Con_Printf ("------------\n%d variables\n", i); Con_Printf ("------------\n%d variables\n", i);
} }
@ -420,7 +424,6 @@ void Cvar_Shutdown (void)
while(var) while(var)
{ {
next = var->next; next = var->next;
free(var->description);
free(var->string); free(var->string);
free(var->name); free(var->name);
free(var); free(var);
@ -459,20 +462,15 @@ cvar_t *Cvar_Get(char *name, char *string, int cvarflags, char *description)
v->string = malloc (strlen(string)+1); v->string = malloc (strlen(string)+1);
strcpy (v->string, string); strcpy (v->string, string);
v->flags = cvarflags; v->flags = cvarflags;
v->description = strdup(description); v->description = description;
v->value = atof (v->string); v->value = atof (v->string);
return v; return v;
} }
// Cvar does exist, so we update the flags and return. // Cvar does exist, so we update the flags and return.
v->flags ^= CVAR_USER_CREATED; v->flags &= ~CVAR_USER_CREATED;
v->flags ^= CVAR_HEAP;
v->flags |= cvarflags; v->flags |= cvarflags;
if (!strcmp (v->description,"User created cvar")) v->description = description;
{
// Set with the real description
free(v->description);
v->description = strdup (description);
}
return v; return v;
} }