yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-29 15:51:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

cvar aufgeräumt

Browse source
This commit is contained in:
Yamagi Burmeister 2009-03-03 18:47:33 +00:00
parent 7680cdb4e4
commit fa00a0b699
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/common/cvar.c
View file

@ -44,7 +44,7 @@ static qboolean Cvar_InfoValidate (char *s)
Cvar_FindVar Cvar_FindVar
============ ============
*/ */
static cvar_t *Cvar_FindVar (char *var_name) static cvar_t *Cvar_FindVar (const char *var_name)
{ {
cvar_t *var; cvar_t *var;
@ -76,7 +76,7 @@ float Cvar_VariableValue (char *var_name)
Cvar_VariableString Cvar_VariableString
============ ============
*/ */
char *Cvar_VariableString (char *var_name) const char *Cvar_VariableString (const char *var_name)
{ {
cvar_t *var; cvar_t *var;
@ -97,7 +97,7 @@ char *Cvar_CompleteVariable (char *partial)
cvar_t *cvar; cvar_t *cvar;
int len; int len;
len = strlen(partial); len = (int)strlen(partial);
if (!len) if (!len)
return NULL; return NULL;
@ -225,7 +225,8 @@ cvar_t *Cvar_Set2 (char *var_name, char *value, qboolean force)
else else
{ {
var->string = CopyString(value); var->string = CopyString(value);
var->value = atof (var->string); var->value = (float)atof (var->string);
if (!strcmp(var->name, "game")) if (!strcmp(var->name, "game"))
{ {
FS_SetGamedir (var->string); FS_SetGamedir (var->string);
@ -303,7 +304,8 @@ cvar_t *Cvar_FullSet (char *var_name, char *value, int flags)
Z_Free (var->string); // free the old value string Z_Free (var->string); // free the old value string
var->string = CopyString(value); var->string = CopyString(value);
var->value = atof (var->string); var->value = (float)atof (var->string);
var->flags = flags; var->flags = flags;
return var; return var;
@ -345,6 +347,7 @@ void Cvar_GetLatchedVars (void)
var->string = var->latched_string; var->string = var->latched_string;
var->latched_string = NULL; var->latched_string = NULL;
var->value = atof(var->string); var->value = atof(var->string);
if (!strcmp(var->name, "game")) if (!strcmp(var->name, "game"))
{ {
FS_SetGamedir (var->string); FS_SetGamedir (var->string);
@ -364,12 +367,12 @@ qboolean Cvar_Command (void)
{ {
cvar_t *v; cvar_t *v;
// check variables // check variables
v = Cvar_FindVar (Cmd_Argv(0)); v = Cvar_FindVar (Cmd_Argv(0));
if (!v) if (!v)
return false; return false;
// perform a variable print or set // perform a variable print or set
if (Cmd_Argc() == 1) if (Cmd_Argc() == 1)
{ {
Com_Printf ("\"%s\" is \"%s\"\n", v->name, v->string); Com_Printf ("\"%s\" is \"%s\"\n", v->name, v->string);

2
src/common/qcommon.h
View file

@ -481,7 +481,7 @@ void Cvar_SetValue (char *var_name, float value);
float Cvar_VariableValue (char *var_name); float Cvar_VariableValue (char *var_name);
// returns 0 if not defined or non numeric // returns 0 if not defined or non numeric
char *Cvar_VariableString (char *var_name); const char *Cvar_VariableString (const char *var_name);
// returns an empty string if not defined // returns an empty string if not defined
char *Cvar_CompleteVariable (char *partial); char *Cvar_CompleteVariable (char *partial);