const char *Cvar_CompleteVariable (const char *partial)
{
cvar_t *cvar;
- int len;
+ size_t len;
len = strlen(partial);
int Cvar_CompleteCountPossible (const char *partial)
{
cvar_t *cvar;
- int len;
+ size_t len;
int h;
h = 0;
const char **Cvar_CompleteBuildList (const char *partial)
{
const cvar_t *cvar;
- int len = 0;
- int bpos = 0;
- int sizeofbuf = (Cvar_CompleteCountPossible (partial) + 1) * sizeof (const char *);
+ size_t len = 0;
+ size_t bpos = 0;
+ size_t sizeofbuf = (Cvar_CompleteCountPossible (partial) + 1) * sizeof (const char *);
const char **buf;
len = strlen(partial);
- buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *));
+ buf = (const char **)Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *));
// Loop through the alias list and print all matches
for (cvar = cvar_vars; cvar; cvar = cvar->next)
if (!strncasecmp(partial, cvar->name, len))
{
Z_Free (var->string); // free the old value string
- var->string = Z_Malloc (strlen(value)+1);
+ var->string = (char *)Z_Malloc (strlen(value)+1);
}
strcpy (var->string, value);
var->value = atof (var->string);
*/
void Cvar_SetValueQuick(cvar_t *var, float value)
{
- char val[256];
+ char val[MAX_INPUTLINE];
if ((float)((int)value) == value)
sprintf(val, "%i", (int)value);
void Cvar_SetValue(const char *var_name, float value)
{
- char val[256];
+ char val[MAX_INPUTLINE];
if ((float)((int)value) == value)
sprintf(val, "%i", (int)value);
if (cvar->flags & CVAR_ALLOCATED)
{
if (developer.integer)
- Con_Printf("... replacing existing allocated cvar {\"%s\", \"%s\", %i}", cvar->name, cvar->string, cvar->flags);
+ Con_Printf("... replacing existing allocated cvar {\"%s\", \"%s\", %i}\n", cvar->name, cvar->string, cvar->flags);
// fixed variables replace allocated ones
// (because the engine directly accesses fixed variables)
// NOTE: this isn't actually used currently
// copy the value off, because future sets will Z_Free it
oldstr = variable->string;
- variable->string = Z_Malloc (strlen(variable->string)+1);
+ variable->string = (char *)Z_Malloc (strlen(variable->string)+1);
strcpy (variable->string, oldstr);
- variable->defstring = Z_Malloc (strlen(variable->string)+1);
+ variable->defstring = (char *)Z_Malloc (strlen(variable->string)+1);
strcpy (variable->defstring, oldstr);
variable->value = atof (variable->string);
variable->integer = (int) variable->value;
cvar->flags |= flags;
Cvar_SetQuick_Internal (cvar, value);
// also set the default value (but only once)
- if (~cvar->flags & CVAR_DEFAULTSET)
+ if (~cvar->flags & CVAR_DEFAULTSET)
{
cvar->flags |= CVAR_DEFAULTSET;
Z_Free(cvar->defstring);
- cvar->defstring = Z_Malloc(strlen(value) + 1);
+ cvar->defstring = (char *)Z_Malloc(strlen(value) + 1);
strcpy(cvar->defstring, value);
}
return cvar;
// allocate a new cvar, cvar name, and cvar string
// FIXME: these never get Z_Free'd
- cvar = Z_Malloc(sizeof(cvar_t));
+ cvar = (cvar_t *)Z_Malloc(sizeof(cvar_t));
cvar->flags = flags | CVAR_ALLOCATED | CVAR_DEFAULTSET;
- cvar->name = Z_Malloc(strlen(name)+1);
+ cvar->name = (char *)Z_Malloc(strlen(name)+1);
strcpy(cvar->name, name);
- cvar->string = Z_Malloc(strlen(value)+1);
+ cvar->string = (char *)Z_Malloc(strlen(value)+1);
strcpy(cvar->string, value);
- cvar->defstring = Z_Malloc(strlen(value)+1);
+ cvar->defstring = (char *)Z_Malloc(strlen(value)+1);
strcpy(cvar->defstring, value);
cvar->value = atof (cvar->string);
cvar->integer = (int) cvar->value;
{
cvar_t *cvar;
const char *partial;
- int len, count;
+ size_t len;
+ int count;
if (Cmd_Argc() > 1)
{
count++;
}
- Con_Printf("%i cvar(s)", count);
if (partial)
- Con_Printf(" beginning with \"%s\"", partial);
- Con_Print("\n");
+ Con_Printf("%i cvar(s) beginning with \"%s\"\n", count, partial);
+ else
+ Con_Printf("%i cvar(s)\n", count);
}
// 2000-01-09 CvarList command by Maddes