X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=905fa758a6f10b1b8817982635c8fca9324e9235;hb=47d1f32605adf4633cbd77d8152b2da0533fe263;hp=0b039e7f9754675ea802069689fe2891083eb40e;hpb=203ba72bec0358b73c4ca379b0e4da07a7352e02;p=xonotic%2Fdarkplaces.git

diff --git a/cvar.c b/cvar.c
index 0b039e7f..905fa758 100644
--- a/cvar.c
+++ b/cvar.c
@@ -35,14 +35,17 @@ Cvar_FindVar
 cvar_t *Cvar_FindVar(cvar_state_t *cvars, const char *var_name, int neededflags)
 {
 	int hashindex;
-	cvar_t *var;
+	cvar_hash_t *hash;
 
 	// use hash lookup to minimize search time
 	hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)) % CVAR_HASHSIZE;
-	for (var = cvars->hashtable[hashindex];var;var = var->nextonhashchain)
-		if (!strcmp (var_name, var->name) && (var->flags & neededflags))
-			return var;
-
+	for (hash = cvars->hashtable[hashindex];hash;hash = hash->next)
+		if (!strcmp (var_name, hash->cvar->name) && (hash->cvar->flags & neededflags))
+			return hash->cvar;
+		else
+			for (int i = 0; i < hash->cvar->aliasindex; i++)
+				if (!strcmp (var_name, hash->cvar->aliases[i]) && (hash->cvar->flags & neededflags))
+					return hash->cvar;
 	return NULL;
 }
 
@@ -70,34 +73,37 @@ cvar_t *Cvar_FindVarAfter(cvar_state_t *cvars, const char *prev_var_name, int ne
 	return var;
 }
 
-static cvar_t *Cvar_FindVarLink(cvar_state_t *cvars, const char *var_name, cvar_t **parent, cvar_t ***link, cvar_t **prev_alpha, int neededflags)
+static cvar_hash_t *Cvar_FindVarLink(cvar_state_t *cvars, const char *var_name, cvar_hash_t **parent, cvar_hash_t ***link, cvar_t **prev_alpha, int neededflags)
 {
 	int hashindex;
-	cvar_t *var;
+	cvar_hash_t *hash;
 
 	// use hash lookup to minimize search time
-	hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name));
+	hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)) % CVAR_HASHSIZE;
 	if(parent) *parent = NULL;
 	if(prev_alpha) *prev_alpha = NULL;
 	if(link) *link = &cvars->hashtable[hashindex];
-	for (var = cvars->hashtable[hashindex];var;var = var->nextonhashchain)
+	for (hash = cvars->hashtable[hashindex];hash;hash = hash->next)
 	{
-		if (!strcmp (var_name, var->name) && (var->flags & neededflags))
-		{
-			if(!prev_alpha || var == cvars->vars)
-				return var;
-
-			*prev_alpha = cvars->vars;
-			// if prev_alpha happens to become NULL then there has been some inconsistency elsewhere
-			// already - should I still insert '*prev_alpha &&' in the loop?
-			while((*prev_alpha)->next != var)
-				*prev_alpha = (*prev_alpha)->next;
-			return var;
-		}
-		if(parent) *parent = var;
+		if (!strcmp (var_name, hash->cvar->name) && (hash->cvar->flags & neededflags))
+			goto match;
+		else
+			for (int i = 0; i < hash->cvar->aliasindex; i++)
+				if (!strcmp (var_name, hash->cvar->aliases[i]) && (hash->cvar->flags & neededflags))
+					goto match;
+		if(parent) *parent = hash;
 	}
-
 	return NULL;
+match:
+	if(!prev_alpha || hash->cvar == cvars->vars)
+		return hash;
+
+	*prev_alpha = cvars->vars;
+	// if prev_alpha happens to become NULL then there has been some inconsistency elsewhere
+	// already - should I still insert '*prev_alpha &&' in the loop?
+	while((*prev_alpha)->next != hash->cvar)
+		*prev_alpha = (*prev_alpha)->next;
+	return hash;
 }
 
 /*
@@ -219,7 +225,11 @@ int Cvar_CompleteCountPossible(cvar_state_t *cvars, const char *partial, int nee
 	for (cvar = cvars->vars; cvar; cvar = cvar->next)
 		if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
 			h++;
-
+		else
+			for(int i = 0; i < cvar->aliasindex; i++)
+				if (!strncasecmp(partial, cvar->aliases[i], len) && (cvar->flags & neededflags))
+					h++;
+		
 	return h;
 }
 
@@ -246,16 +256,28 @@ const char **Cvar_CompleteBuildList(cvar_state_t *cvars, const char *partial, in
 	for (cvar = cvars->vars; cvar; cvar = cvar->next)
 		if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
 			buf[bpos++] = cvar->name;
+		else
+			for(int i = 0; i < cvar->aliasindex; i++)
+				if (!strncasecmp(partial, cvar->aliases[i], len) && (cvar->flags & neededflags))
+					buf[bpos++] = cvar->aliases[i];
+		
 
 	buf[bpos] = NULL;
 	return buf;
 }
 
-void Cvar_PrintHelp(cvar_t *cvar, qboolean full)
+void Cvar_PrintHelp(cvar_t *cvar, const char *name, qboolean full)
 {
-	Con_Printf("^3%s^7 is \"%s\" [\"%s\"] ", cvar->name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring);
+	// Aliases are purple, cvars are yellow
+	if (strcmp(cvar->name, name))
+		Con_Printf("^6");
+	else
+		Con_Printf("^3");
+	Con_Printf("%s^7 is \"%s\" [\"%s\"]", name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring);
+	if (strcmp(cvar->name, name))
+		Con_Printf(" (also ^3%s^7)", cvar->name);
 	if (full)
-		Con_Printf("%s", cvar->description);
+		Con_Printf(" %s", cvar->description);
 	Con_Printf("\n");
 }
 
@@ -267,7 +289,13 @@ void Cvar_CompleteCvarPrint(cvar_state_t *cvars, const char *partial, int needed
 	// Loop through the command list and print all matches
 	for (cvar = cvars->vars; cvar; cvar = cvar->next)
 		if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
-			Cvar_PrintHelp(cvar, true);
+			Cvar_PrintHelp(cvar, cvar->name, true);
+		else
+			for (int i = 0; i < cvar->aliasindex; i++)
+				if (!strncasecmp (partial, cvar->aliases[i], len) && (cvar->flags & neededflags))
+					Cvar_PrintHelp(cvar, cvar->aliases[i], true);
+
+		
 }
 
 // check if a cvar is held by some progs
@@ -345,10 +373,8 @@ Cvar_Set
 extern cvar_t sv_disablenotify;
 static void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 {
-	cvar_state_t *cvars = &cvars_all;
 	qboolean changed;
 	size_t valuelen;
-	char vabuf[1024];
 	char new_value[MAX_INPUTLINE];
 
 	changed = strcmp(var->string, value) != 0;
@@ -374,7 +400,7 @@ static void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 	var->value = atof (var->string);
 	var->integer = (int) var->value;
 	if ((var->flags & CVAR_NOTIFY) && changed && sv.active && !sv_disablenotify.integer)
-		SV_BroadcastPrintf("\001^3Server cvar \"%s\" changed to \"%s\"\n", var->name, var->string);
+		SV_BroadcastPrintf("\003^3Server cvar \"%s\" changed to \"%s\"\n", var->name, var->string);
 #if 0
 	// TODO: add infostring support to the server?
 	if ((var->flags & CVAR_SERVERINFO) && changed && sv.active)
@@ -388,50 +414,8 @@ static void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 		}
 	}
 #endif
-	if ((var->flags & CVAR_USERINFO) && cls.state != ca_dedicated)
+	if (var->flags & CVAR_USERINFO)
 		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(vabuf, sizeof(vabuf), "%i", top), true, false, false, false);
-			CL_SetInfo("bottomcolor", va(vabuf, sizeof(vabuf), "%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(vabuf, sizeof(vabuf), "color %i %i", top, bottom));
-			}
-		}
-		else if (!strcmp(var->name, "_cl_rate"))
-			CL_SetInfo("rate", va(vabuf, sizeof(vabuf), "%i", var->integer), true, false, false, false);
-		else if (!strcmp(var->name, "_cl_rate_burstsize"))
-			CL_SetInfo("rate_burstsize", va(vabuf, sizeof(vabuf), "%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(cvars, "rcon_password", "");
-		}
-#ifdef CONFIG_MENU
-		else if (!strcmp(var->name, "net_slist_favorites"))
-			NetConn_UpdateFavorites();
-#endif
-	}
 
 	Cvar_UpdateAutoCvar(var);
 }
@@ -462,6 +446,14 @@ void Cvar_Set(cvar_state_t *cvars, const char *var_name, const char *value)
 	Cvar_SetQuick(var, value);
 }
 
+void Cvar_Set_NoCallback(cvar_t *var, const char *value)
+{
+	void (*callback_save)(char *) = var->callback;
+	var->callback = NULL;
+	Cvar_SetQuick_Internal(var, value);
+	var->callback = callback_save;
+}
+
 /*
 ============
 Cvar_SetValue
@@ -494,6 +486,26 @@ void Cvar_RegisterCallback(cvar_t *variable, void (*callback)(char *))
 	variable->callback = callback;
 }
 
+void Cvar_RegisterAlias(cvar_t *variable, const char *alias )
+{
+	cvar_state_t *cvars = &cvars_all;
+	cvar_hash_t *hash;
+	int hashindex;
+
+	variable->aliases = (char **)Mem_Realloc(zonemempool, variable->aliases, sizeof(char *) * (variable->aliasindex + 1));
+	// Add to it
+	variable->aliases[variable->aliasindex] = (char *)Z_Malloc(strlen(alias) + 1);
+	memcpy(variable->aliases[variable->aliasindex], alias, strlen(alias) + 1);
+	variable->aliasindex++;
+
+	// link to head of list in this hash table index
+	hash = (cvar_hash_t *)Z_Malloc(sizeof(cvar_hash_t));
+	hashindex = CRC_Block((const unsigned char *)alias, strlen(alias)) % CVAR_HASHSIZE;
+	hash->next = cvars->hashtable[hashindex];
+	cvars->hashtable[hashindex] = hash;
+	hash->cvar = variable;
+}
+
 /*
 ============
 Cvar_RegisterVariable
@@ -505,6 +517,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
 {
 	cvar_state_t *cvars = NULL;
 	int hashindex;
+	cvar_hash_t *hash;
 	cvar_t *current, *next, *cvar;
 	char *oldstr;
 	size_t alloclen;
@@ -590,6 +603,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
 	memcpy ((char *)variable->defstring, oldstr, alloclen);
 	variable->value = atof (variable->string);
 	variable->integer = (int) variable->value;
+	variable->aliasindex = 0;
 
 	// Mark it as not an autocvar.
 	for (i = 0;i < PRVM_PROG_MAX;i++)
@@ -607,9 +621,11 @@ void Cvar_RegisterVariable (cvar_t *variable)
 	variable->next = next;
 
 	// link to head of list in this hash table index
+	hash = (cvar_hash_t *)Z_Malloc(sizeof(cvar_hash_t));
 	hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name)) % CVAR_HASHSIZE;
-	variable->nextonhashchain = cvars->hashtable[hashindex];
-	cvars->hashtable[hashindex] = variable;
+	hash->next = cvars->hashtable[hashindex];
+	hash->cvar = variable;
+	cvars->hashtable[hashindex] = hash;
 }
 
 /*
@@ -622,6 +638,7 @@ Adds a newly allocated variable to the variable list or sets its value.
 cvar_t *Cvar_Get(cvar_state_t *cvars, const char *name, const char *value, int flags, const char *newdescription)
 {
 	int hashindex;
+	cvar_hash_t *hash;
 	cvar_t *current, *next, *cvar;
 	int i;
 
@@ -671,6 +688,8 @@ cvar_t *Cvar_Get(cvar_state_t *cvars, const char *name, const char *value, int f
 	cvar->defstring = (char *)Mem_strdup(zonemempool, value);
 	cvar->value = atof (cvar->string);
 	cvar->integer = (int) cvar->value;
+	cvar->aliases = (char **)Z_Malloc(sizeof(char **));
+	memset(cvar->aliases, 0, sizeof(char *));
 
 	if(newdescription && *newdescription)
 		cvar->description = (char *)Mem_strdup(zonemempool, newdescription);
@@ -692,13 +711,27 @@ cvar_t *Cvar_Get(cvar_state_t *cvars, const char *name, const char *value, int f
 	cvar->next = next;
 
 	// link to head of list in this hash table index
+	hash = (cvar_hash_t *)Z_Malloc(sizeof(cvar_hash_t));
 	hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name)) % CVAR_HASHSIZE;
-	cvar->nextonhashchain = cvars->hashtable[hashindex];
-	cvars->hashtable[hashindex] = cvar;
+	hash->next = cvars->hashtable[hashindex];
+	cvars->hashtable[hashindex] = hash;
+	hash->cvar = cvar;
 
 	return cvar;
 }
 
+qboolean Cvar_Readonly (cvar_t *var, const char *cmd_name)
+{
+	if (var->flags & CVAR_READONLY)
+	{
+		if(cmd_name)
+			Con_Printf("%s: ",cmd_name);
+		Con_Printf("%s", var->name);
+		Con_Printf(" is read-only\n");
+		return true;
+	}
+	return false;
+}
 
 /*
 ============
@@ -713,25 +746,23 @@ qboolean	Cvar_Command (cmd_state_t *cmd)
 	cvar_t			*v;
 
 // check variables
-	v = Cvar_FindVar(cvars, Cmd_Argv(cmd, 0), cmd->cvars_flagsmask);
+	v = Cvar_FindVar(cvars, Cmd_Argv(cmd, 0), (cmd->cvars_flagsmask));
 	if (!v)
 		return false;
 
 // perform a variable print or set
 	if (Cmd_Argc(cmd) == 1)
 	{
-		Cvar_PrintHelp(v, true);
+		Cvar_PrintHelp(v, Cmd_Argv(cmd, 0), true);
 		return true;
 	}
 
 	if (developer_extra.integer)
 		Con_DPrint("Cvar_Command: ");
-
-	if (v->flags & CVAR_READONLY)
-	{
-		Con_Printf("%s is read-only\n", v->name);
+	
+	if(Cvar_Readonly(v, NULL))
 		return true;
-	}
+	
 	Cvar_SetQuick(v, Cmd_Argv(cmd, 1));
 	if (developer_extra.integer)
 		Con_DPrint("\n");
@@ -837,15 +868,15 @@ void Cvar_RestoreInitState(cvar_state_t *cvars)
 			Con_DPrintf("Cvar_RestoreInitState: Destroying cvar \"%s\"\n", c->name);
 			// unlink struct from hash
 			hashindex = CRC_Block((const unsigned char *)c->name, strlen(c->name)) % CVAR_HASHSIZE;
-			for (cp2 = &cvars->hashtable[hashindex];(c2 = *cp2);)
+			for (cp2 = &cvars->hashtable[hashindex]->cvar;(c2 = *cp2);)
 			{
 				if (c2 == c)
 				{
-					*cp2 = c2->nextonhashchain;
+					*cp2 = cvars->hashtable[hashindex]->next->cvar;
 					break;
 				}
 				else
-					cp2 = &c2->nextonhashchain;
+					cp2 = &cvars->hashtable[hashindex]->next->cvar;
 			}
 			// unlink struct from main list
 			*cp = c->next;
@@ -868,8 +899,10 @@ void Cvar_ResetToDefaults_All_f(cmd_state_t *cmd)
 	cvar_t *var;
 	// restore the default values of all cvars
 	for (var = cvars->vars ; var ; var = var->next)
+	{
 		if((var->flags & CVAR_NORESETTODEFAULTS) == 0)
 			Cvar_SetQuick(var, var->defstring);
+	}
 }
 
 
@@ -879,8 +912,10 @@ void Cvar_ResetToDefaults_NoSaveOnly_f(cmd_state_t *cmd)
 	cvar_t *var;
 	// restore the default values of all cvars
 	for (var = cvars->vars ; var ; var = var->next)
+	{
 		if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == 0)
 			Cvar_SetQuick(var, var->defstring);
+	}
 }
 
 
@@ -890,8 +925,10 @@ void Cvar_ResetToDefaults_SaveOnly_f(cmd_state_t *cmd)
 	cvar_t *var;
 	// restore the default values of all cvars
 	for (var = cvars->vars ; var ; var = var->next)
+	{
 		if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == CVAR_SAVE)
 			Cvar_SetQuick(var, var->defstring);
+	}
 }
 
 
@@ -909,13 +946,14 @@ void Cvar_WriteVariables (cvar_state_t *cvars, qfile_t *f)
 	char buf1[MAX_INPUTLINE], buf2[MAX_INPUTLINE];
 
 	// don't save cvars that match their default value
-	for (var = cvars->vars ; var ; var = var->next)
+	for (var = cvars->vars ; var ; var = var->next) {
 		if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || ((var->flags & CVAR_ALLOCATED) && !(var->flags & CVAR_DEFAULTSET))))
 		{
 			Cmd_QuoteString(buf1, sizeof(buf1), var->name, "\"\\$", false);
 			Cmd_QuoteString(buf2, sizeof(buf2), var->string, "\"\\$", false);
 			FS_Printf(f, "%s\"%s\" \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", buf1, buf2);
 		}
+	}
 }
 
 
@@ -931,39 +969,47 @@ void Cvar_List_f(cmd_state_t *cmd)
 	cvar_state_t *cvars = cmd->cvars;
 	cvar_t *cvar;
 	const char *partial;
-	size_t len;
 	int count;
 	qboolean ispattern;
+	char vabuf[1024];
 
 	if (Cmd_Argc(cmd) > 1)
 	{
 		partial = Cmd_Argv(cmd, 1);
-		len = strlen(partial);
 		ispattern = (strchr(partial, '*') || strchr(partial, '?'));
+		if(!ispattern)
+			partial = va(vabuf, sizeof(vabuf), "%s*", partial);
 	}
 	else
 	{
-		partial = NULL;
-		len = 0;
+		partial = va(vabuf, sizeof(vabuf), "*");
 		ispattern = false;
 	}
 
 	count = 0;
 	for (cvar = cvars->vars; cvar; cvar = cvar->next)
 	{
-		if (len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp (partial,cvar->name,len)))
-			continue;
-
-		Cvar_PrintHelp(cvar, true);
-		count++;
+		if (matchpattern_with_separator(cvar->name, partial, false, "", false))
+		{
+			Cvar_PrintHelp(cvar, cvar->name, true);
+			count++;
+		}
+		for (int i = 0; i < cvar->aliasindex; i++)
+		{
+			if (matchpattern_with_separator(cvar->aliases[i], partial, false, "", false))
+			{
+				Cvar_PrintHelp(cvar, cvar->aliases[i], true);
+				count++;
+			}
+		}
 	}
 
-	if (len)
+	if (Cmd_Argc(cmd) > 1)
 	{
 		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);
+			Con_Printf("%i cvar%s beginning with \"%s\"\n", count, (count > 1) ? "s" : "", Cmd_Argv(cmd,1));
 	}
 	else
 		Con_Printf("%i cvar(s)\n", count);
@@ -984,11 +1030,9 @@ void Cvar_Set_f(cmd_state_t *cmd)
 
 	// check if it's read-only
 	cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0);
-	if (cvar && cvar->flags & CVAR_READONLY)
-	{
-		Con_Printf("Set: %s is read-only\n", cvar->name);
-		return;
-	}
+	if (cvar)
+		if(Cvar_Readonly(cvar,"Set"))
+			return;
 
 	if (developer_extra.integer)
 		Con_DPrint("Set: ");
@@ -1011,11 +1055,9 @@ void Cvar_SetA_f(cmd_state_t *cmd)
 
 	// check if it's read-only
 	cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0);
-	if (cvar && cvar->flags & CVAR_READONLY)
-	{
-		Con_Printf("SetA: %s is read-only\n", cvar->name);
-		return;
-	}
+	if (cvar)
+		if(Cvar_Readonly(cvar,"SetA"))
+			return;
 
 	if (developer_extra.integer)
 		Con_DPrint("SetA: ");
@@ -1029,7 +1071,8 @@ void Cvar_Del_f(cmd_state_t *cmd)
 	cvar_state_t *cvars = cmd->cvars;
 	int neededflags = ~0;
 	int i;
-	cvar_t *cvar, *parent, **link, *prev;
+	cvar_hash_t *hash, *parent, **link;
+	cvar_t *cvar, *prev;
 
 	if(Cmd_Argc(cmd) < 2)
 	{
@@ -1038,17 +1081,16 @@ void Cvar_Del_f(cmd_state_t *cmd)
 	}
 	for(i = 1; i < Cmd_Argc(cmd); ++i)
 	{
-		cvar = Cvar_FindVarLink(cvars, Cmd_Argv(cmd, i), &parent, &link, &prev, neededflags);
+		hash = Cvar_FindVarLink(cvars, Cmd_Argv(cmd, i), &parent, &link, &prev, neededflags);
+		cvar = hash->cvar;
+
 		if(!cvar)
 		{
 			Con_Printf("%s: %s is not defined\n", Cmd_Argv(cmd, 0), Cmd_Argv(cmd, i));
 			continue;
 		}
-		if(cvar->flags & CVAR_READONLY)
-		{
-			Con_Printf("%s: %s is read-only\n", Cmd_Argv(cmd, 0), cvar->name);
+		if(Cvar_Readonly(cvar, Cmd_Argv(cmd, 0)))
 			continue;
-		}
 		if(!(cvar->flags & CVAR_ALLOCATED))
 		{
 			Con_Printf("%s: %s is static and cannot be deleted\n", Cmd_Argv(cmd, 0), cvar->name);
@@ -1066,10 +1108,9 @@ void Cvar_Del_f(cmd_state_t *cmd)
 		}
 
 		if(parent)
-			parent->nextonhashchain = cvar->nextonhashchain;
+			parent->next = hash->next;
 		else if(link)
-			*link = cvar->nextonhashchain;
-
+			*link = hash->next;
 		if(cvar->description != cvar_dummy_description)
 			Z_Free((char *)cvar->description);