summaryrefslogtreecommitdiff
path: root/source/cvar.c
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2008-04-23 15:02:41 +0000
committerAndrey Nazarov <skuller@skuller.net>2008-04-23 15:02:41 +0000
commit49e6170b49fbb933eddec6d0e3f946320c68832f (patch)
tree88d228d6f89103710074fdba041ce80584d5caa6 /source/cvar.c
parent8c795585fb0c6c9178d9981f6943da04b7279205 (diff)
Added `dumpents' server command.
Added support for `cl_noskins' value of 2 (default all female skins to `female/athena', all male skins to `male/grunt'). Renamed `scoreshot' command to `aashot', added `aadump' command. Fixed several alignment issues on ARM architecture. Server browser menu now indicates full and password protected servers with color codes. Implemented history search in console with Ctrl+R, Ctrl+S. Removed `cl_railtrail_alpha' variable, all `cl_rail*_color' variables now accept colors in #RRGGBBAA format. Added `map_override' cvar (enables loading map entity lump from external maps/*.ent file). Made `quit' command accept extra arguments. Made `draw' command accept arbitrary colors in #RRGGBBAA format. Fixed debian packages.
Diffstat (limited to 'source/cvar.c')
-rw-r--r--source/cvar.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/source/cvar.c b/source/cvar.c
index cf09eca..2d22ea4 100644
--- a/source/cvar.c
+++ b/source/cvar.c
@@ -43,7 +43,7 @@ Cvar_FindVar
*/
cvar_t *Cvar_FindVar( const char *var_name ) {
cvar_t *var;
- int hash;
+ unsigned hash;
hash = Com_HashString( var_name, CVARHASH_SIZE );
@@ -235,6 +235,8 @@ cvar_t *Cvar_Get( const char *var_name, const char *var_value, int flags ) {
&& strcmp( var_value, var->string ) )
{
// reset cvar back to default value
+ Com_DPrintf( "Cvar '%s' was reset from '%s' to default '%s'\n",
+ var->name, var->string, var->default_string );
Cvar_UpdateString( var, var_value, CVAR_SET_DIRECT );
}
var->flags &= ~CVAR_USER_CREATED;
@@ -648,14 +650,19 @@ void Cvar_Command( cvar_t *v ) {
static void Cvar_Set_c( genctx_t *ctx, int argnum ) {
char *s;
+ cvar_t *var;
xgenerator_t g;
if( argnum == 1 ) {
Cvar_Variable_g( ctx );
} else if( argnum == 2 ) {
s = Cmd_Argv( ctx->argnum - 1 );
- if( ( g = Cvar_FindGenerator( s ) ) != NULL ) {
- g( ctx );
+ if( ( var = Cvar_FindVar( s ) ) != NULL ) {
+ g = var->generator;
+ if( g ) {
+ ctx->data = var;
+ g( ctx );
+ }
}
}
}
@@ -991,7 +998,7 @@ static void Cvar_Inc_f( void ) {
return;
}
- if( !COM_IsNumeric( var->string ) ) {
+ if( !COM_IsFloat( var->string ) ) {
Com_Printf( "\"%s\" is \"%s\", can't %s\n",
var->name, var->string, Cmd_Argv( 0 ) );
return;