X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=a6734b53adc892a02f8b97db9a1dcbe056488723;hb=b691ec2d4059c35f2e1e8702703045d8d5a916b7;hp=d3df0c421ebc71fce219e56cfe59b2c10e525ddd;hpb=174d8329f84ed718f848273e1e730c60b6d93a28;p=xonotic%2Fdarkplaces.git diff --git a/cvar.c b/cvar.c index d3df0c42..a6734b53 100644 --- a/cvar.c +++ b/cvar.c @@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" +char *cvar_dummy_description = "custom cvar"; + cvar_t *cvar_vars = NULL; cvar_t *cvar_hashtable[65536]; char *cvar_null_string = ""; @@ -38,7 +40,7 @@ cvar_t *Cvar_FindVar (const char *var_name) // use hash lookup to minimize search time hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)); for (var = cvar_hashtable[hashindex];var;var = var->nextonhashchain) - if (!strcasecmp (var_name, var->name)) + if (!strcmp (var_name, var->name)) return var; return NULL; @@ -114,6 +116,21 @@ const char *Cvar_VariableDefString (const char *var_name) return var->defstring; } +/* +============ +Cvar_VariableDescription +============ +*/ +const char *Cvar_VariableDescription (const char *var_name) +{ + cvar_t *var; + + var = Cvar_FindVar (var_name); + if (!var) + return cvar_null_string; + return var->description; +} + /* ============ @@ -203,7 +220,7 @@ void Cvar_CompleteCvarPrint (const char *partial) // Loop through the command list and print all matches for (cvar = cvar_vars; cvar; cvar = cvar->next) if (!strncasecmp(partial, cvar->name, len)) - Con_Printf ("%c3%s%s : \"%s\" (\"%s\") : %s\n", STRING_COLOR_TAG, cvar->name, STRING_COLOR_DEFAULT_STR, cvar->string, cvar->defstring, cvar->description); + Con_Printf ("^3%s^7 is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description); } @@ -217,7 +234,7 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value) qboolean changed; size_t valuelen; - changed = strcmp(var->string, value); + changed = strcmp(var->string, value) != 0; // LordHavoc: don't reallocate when there is no change if (!changed) return; @@ -250,6 +267,44 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value) #endif if ((var->flags & CVAR_USERINFO) && cls.state != ca_dedicated) CL_SetInfo(var->name, var->string, true, false, false, false); + else if ((var->flags & CVAR_NQUSERINFOHACK) && cls.state != ca_dedicated) + { + // update the cls.userinfo to have proper values for the + // silly nq config variables. + // + // this is done when these variables are changed rather than at + // connect time because if the user or code checks the userinfo and it + // holds weird values it may cause confusion... + if (!strcmp(var->name, "_cl_color")) + { + int top = (var->integer >> 4) & 15, bottom = var->integer & 15; + CL_SetInfo("topcolor", va("%i", top), true, false, false, false); + CL_SetInfo("bottomcolor", va("%i", bottom), true, false, false, false); + if (cls.protocol != PROTOCOL_QUAKEWORLD && cls.netcon) + { + MSG_WriteByte(&cls.netcon->message, clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("color %i %i", top, bottom)); + } + } + else if (!strcmp(var->name, "_cl_rate")) + CL_SetInfo("rate", va("%i", var->integer), true, false, false, false); + else if (!strcmp(var->name, "_cl_playerskin")) + CL_SetInfo("playerskin", var->string, true, false, false, false); + else if (!strcmp(var->name, "_cl_playermodel")) + CL_SetInfo("playermodel", var->string, true, false, false, false); + else if (!strcmp(var->name, "_cl_name")) + CL_SetInfo("name", var->string, true, false, false, false); + else if (!strcmp(var->name, "rcon_secure")) + { + // whenever rcon_secure is changed to 0, clear rcon_password for + // security reasons (prevents a send-rcon-password-as-plaintext + // attack based on NQ protocol session takeover and svc_stufftext) + if(var->integer <= 0) + Cvar_Set("rcon_password", ""); + } + else if (!strcmp(var->name, "net_slist_favorites")) + NetConn_UpdateFavorites(); + } } void Cvar_SetQuick (cvar_t *var, const char *value) @@ -288,9 +343,9 @@ void Cvar_SetValueQuick(cvar_t *var, float value) char val[MAX_INPUTLINE]; if ((float)((int)value) == value) - sprintf(val, "%i", (int)value); + dpsnprintf(val, sizeof(val), "%i", (int)value); else - sprintf(val, "%f", value); + dpsnprintf(val, sizeof(val), "%f", value); Cvar_SetQuick(var, val); } @@ -299,9 +354,9 @@ void Cvar_SetValue(const char *var_name, float value) char val[MAX_INPUTLINE]; if ((float)((int)value) == value) - sprintf(val, "%i", (int)value); + dpsnprintf(val, sizeof(val), "%i", (int)value); else - sprintf(val, "%f", value); + dpsnprintf(val, sizeof(val), "%f", value); Cvar_Set(var_name, val); } @@ -406,7 +461,7 @@ Cvar_Get Adds a newly allocated variable to the variable list or sets its value. ============ */ -cvar_t *Cvar_Get (const char *name, const char *value, int flags) +cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *newdescription) { int hashindex; cvar_t *current, *next, *cvar; @@ -421,9 +476,30 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags) { cvar->flags |= flags; Cvar_SetQuick_Internal (cvar, value); + if(newdescription && (cvar->flags & CVAR_ALLOCATED)) + { + if(cvar->description != cvar_dummy_description) + Z_Free(cvar->description); + + if(*newdescription) + { + alloclen = strlen(newdescription) + 1; + cvar->description = (char *)Z_Malloc(alloclen); + memcpy(cvar->description, newdescription, alloclen); + } + else + cvar->description = cvar_dummy_description; + } return cvar; } +// check for pure evil + if (!*name) + { + Con_Printf("Cvar_Get: invalid variable name\n"); + return NULL; + } + // check for overlap with a command if (Cmd_Exists (name)) { @@ -446,7 +522,15 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags) memcpy(cvar->defstring, value, alloclen); cvar->value = atof (cvar->string); cvar->integer = (int) cvar->value; - cvar->description = "custom cvar"; + + if(newdescription && *newdescription) + { + alloclen = strlen(newdescription) + 1; + cvar->description = (char *)Z_Malloc(alloclen); + memcpy(cvar->description, newdescription, alloclen); + } + else + cvar->description = cvar_dummy_description; // actually checked by VM_cvar_type // link the variable in // alphanumerical order @@ -486,7 +570,7 @@ qboolean Cvar_Command (void) // perform a variable print or set if (Cmd_Argc() == 1) { - Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, v->string, v->defstring); + Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, ((v->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : v->string), v->defstring); return true; } @@ -540,7 +624,8 @@ void Cvar_ResetToDefaults_All_f (void) cvar_t *var; // restore the default values of all cvars for (var = cvar_vars ; var ; var = var->next) - Cvar_SetQuick(var, var->defstring); + if((var->flags & CVAR_NORESETTODEFAULTS) == 0) + Cvar_SetQuick(var, var->defstring); } @@ -549,7 +634,7 @@ void Cvar_ResetToDefaults_NoSaveOnly_f (void) cvar_t *var; // restore the default values of all cvars for (var = cvar_vars ; var ; var = var->next) - if (!(var->flags & CVAR_SAVE)) + if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == 0) Cvar_SetQuick(var, var->defstring); } @@ -559,7 +644,7 @@ void Cvar_ResetToDefaults_SaveOnly_f (void) cvar_t *var; // restore the default values of all cvars for (var = cvar_vars ; var ; var = var->next) - if (var->flags & CVAR_SAVE) + if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == CVAR_SAVE) Cvar_SetQuick(var, var->defstring); } @@ -575,11 +660,16 @@ with the archive flag set to true. void Cvar_WriteVariables (qfile_t *f) { cvar_t *var; + char buf1[MAX_INPUTLINE], buf2[MAX_INPUTLINE]; // don't save cvars that match their default value for (var = cvar_vars ; var ; var = var->next) if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || (var->flags & CVAR_ALLOCATED))) - FS_Printf(f, "%s%s \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string); + { + Cmd_QuoteString(buf1, sizeof(buf1), var->name, "\"\\$"); + Cmd_QuoteString(buf2, sizeof(buf2), var->string, "\"\\$"); + FS_Printf(f, "%s\"%s\" \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", buf1, buf2); + } } @@ -596,6 +686,7 @@ void Cvar_List_f (void) const char *partial; size_t len; int count; + qboolean ispattern; if (Cmd_Argc() > 1) { @@ -608,18 +699,25 @@ void Cvar_List_f (void) len = 0; } + ispattern = partial && (strchr(partial, '*') || strchr(partial, '?')); + count = 0; for (cvar = cvar_vars; cvar; cvar = cvar->next) { - if (partial && strncasecmp (partial,cvar->name,len)) + if (len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp (partial,cvar->name,len))) continue; - Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description); + Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring, cvar->description); count++; } - if (partial) - Con_Printf("%i cvar(s) beginning with \"%s\"\n", count, partial); + if (len) + { + if(ispattern) + Con_Printf("%i cvar%s matching \"%s\"\n", count, (count > 1) ? "s" : "", partial); + else + Con_Printf("%i cvar%s beginning with \"%s\"\n", count, (count > 1) ? "s" : "", partial); + } else Con_Printf("%i cvar(s)\n", count); } @@ -632,7 +730,7 @@ void Cvar_Set_f (void) // make sure it's the right number of parameters if (Cmd_Argc() < 3) { - Con_Printf("Set: wrong number of parameters, usage: set \n"); + Con_Printf("Set: wrong number of parameters, usage: set []\n"); return; } @@ -644,10 +742,11 @@ void Cvar_Set_f (void) return; } - Con_DPrint("Set: "); + if (developer.integer >= 100) + Con_DPrint("Set: "); // all looks ok, create/modify the cvar - Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), 0); + Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), 0, Cmd_Argc() > 3 ? Cmd_Argv(3) : NULL); } void Cvar_SetA_f (void) @@ -657,7 +756,7 @@ void Cvar_SetA_f (void) // make sure it's the right number of parameters if (Cmd_Argc() < 3) { - Con_Printf("SetA: wrong number of parameters, usage: seta \n"); + Con_Printf("SetA: wrong number of parameters, usage: seta []\n"); return; } @@ -669,10 +768,46 @@ void Cvar_SetA_f (void) return; } - Con_DPrint("SetA: "); + if (developer.integer >= 100) + Con_DPrint("SetA: "); // all looks ok, create/modify the cvar - Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE); + Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE, Cmd_Argc() > 3 ? Cmd_Argv(3) : NULL); } - +#ifdef FILLALLCVARSWITHRUBBISH +void Cvar_FillAll_f() +{ + char *buf, *p, *q; + int n, i; + cvar_t *var; + qboolean verify; + if(Cmd_Argc() != 2) + { + Con_Printf("Usage: %s length to plant rubbish\n", Cmd_Argv(0)); + Con_Printf("Usage: %s -length to verify that the rubbish is still there\n", Cmd_Argv(0)); + return; + } + n = atoi(Cmd_Argv(1)); + verify = (n < 0); + if(verify) + n = -n; + buf = Z_Malloc(n + 1); + buf[n] = 0; + for(var = cvar_vars; var; var = var->next) + { + for(i = 0, p = buf, q = var->name; i < n; ++i) + { + *p++ = *q++; + if(!*q) + q = var->name; + } + if(verify && strcmp(var->string, buf)) + { + Con_Printf("\n%s does not contain the right rubbish, either this is the first run or a possible overrun was detected, or something changed it intentionally; it DOES contain: %s\n", var->name, var->string); + } + Cvar_SetQuick(var, buf); + } + Z_Free(buf); +} +#endif /* FILLALLCVARSWITHRUBBISH */