X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cvar.c;h=cbe8b0f6b56205446f0da1c285de48c6c25fcd74;hp=58562d6b642742e911d879ddc0fdc55dd50af0c4;hb=2f5dfa4708db4112f682b31146a8db1d456a0482;hpb=8d2492ac4364e1a51e7f84c6ea1c34429f060939

diff --git a/cvar.c b/cvar.c
index 58562d6b..cbe8b0f6 100644
--- a/cvar.c
+++ b/cvar.c
@@ -492,28 +492,28 @@ void Cvar_RegisterCallback(cvar_t *variable, void (*callback)(cvar_t *))
 	variable->callback = callback;
 }
 
-void Cvar_RegisterAlias(cvar_t *variable, const char *alias )
+void Cvar_RegisterVirtual(cvar_t *variable, const char *name )
 {
 	cvar_state_t *cvars = &cvars_all;
 	cvar_hash_t *hash;
 	int hashindex;
 
-	if(!*alias)
+	if(!*name)
 	{
-		Con_Printf("Cvar_RegisterAlias: invalid alias name\n");
+		Con_Printf("Cvar_RegisterVirtual: invalid virtual cvar name\n");
 		return;
 	}
 
 	// check for overlap with a command
-	if (Cmd_Exists(cmd_local, alias))
+	if (Cmd_Exists(cmd_local, name))
 	{
-		Con_Printf("Cvar_RegisterAlias: %s is a command\n", alias);
+		Con_Printf("Cvar_RegisterVirtual: %s is a command\n", name);
 		return;
 	}
 
-	if(Cvar_FindVar(&cvars_all, alias, 0))
+	if(Cvar_FindVar(&cvars_all, name, 0))
 	{
-		Con_Printf("Cvar_RegisterAlias: %s is a cvar\n", alias);
+		Con_Printf("Cvar_RegisterVirtual: %s is a cvar\n", name);
 		return;
 	}
 
@@ -525,13 +525,13 @@ void Cvar_RegisterAlias(cvar_t *variable, const char *alias )
 	variable->aliases[variable->aliases_size + 1] = NULL;
 	
 	// Add to it
-	variable->aliases[variable->aliases_size] = (char *)Z_Malloc(strlen(alias) + 1);
-	memcpy(variable->aliases[variable->aliases_size], alias, strlen(alias) + 1);
+	variable->aliases[variable->aliases_size] = (char *)Z_Malloc(strlen(name) + 1);
+	memcpy(variable->aliases[variable->aliases_size], name, strlen(name) + 1);
 	variable->aliases_size++;
 
 	// 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;
+	hashindex = CRC_Block((const unsigned char *)name, strlen(name)) % CVAR_HASHSIZE;
 	hash->next = cvars->hashtable[hashindex];
 	cvars->hashtable[hashindex] = hash;
 	hash->cvar = variable;