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

diff --git a/cvar.c b/cvar.c
index ce1e0652..58562d6b 100644
--- a/cvar.c
+++ b/cvar.c
@@ -647,7 +647,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
 	}
 
 	// check for overlap with a command
-	if (Cmd_Exists(cmd_local, variable->name) || Cmd_Exists(cmd_local, variable->name))
+	if (Cmd_Exists(cmd_local, variable->name))
 	{
 		Con_Printf("Cvar_RegisterVariable: %s is a command\n", variable->name);
 		return;
@@ -712,7 +712,7 @@ cvar_t *Cvar_Get(cvar_state_t *cvars, const char *name, const char *value, int f
 	}
 
 	// check for overlap with a command
-	if (Cmd_Exists(cmd_local, name) || Cmd_Exists(cmd_local, name))
+	if (Cmd_Exists(cmd_local, name))
 	{
 		Con_Printf("Cvar_Get: %s is a command\n", name);
 		return NULL;
@@ -731,7 +731,6 @@ cvar_t *Cvar_Get(cvar_state_t *cvars, const char *name, const char *value, int f
 	cvar->aliases = NULL;
 	cvar->aliases_size = 0;
 	cvar->initstate = NULL;
-	memset(cvar->aliases, 0, sizeof(char *));
 
 	if(newdescription && *newdescription)
 		cvar->description = (char *)Mem_strdup(zonemempool, newdescription);