X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcolorbutton.qc;h=49bffed257acf362a993bd3d6e00f5303f40eb1c;hb=abf4b5a430d71fc83abbe90da9b17b457a65e149;hp=6675c1aee789ec2b0ab1291e3fce46bd423347f8;hpb=d271f27a5ac351a3a7b39636932f6d661492be1d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/colorbutton.qc b/qcsrc/menu/xonotic/colorbutton.qc
index 6675c1aee..49bffed25 100644
--- a/qcsrc/menu/xonotic/colorbutton.qc
+++ b/qcsrc/menu/xonotic/colorbutton.qc
@@ -30,7 +30,7 @@ void XonoticColorButton_configureXonoticColorButton(entity me, float theGroup, f
 			// no change
 			break;
 	}
-	me.cvarName = "_cl_color";
+	me.controlledCvar = "_cl_color";
 	me.cvarValueFloat = theValue;
 	me.cvarPart = theColor;
 	me.loadCvars(me);
@@ -46,30 +46,29 @@ void XonoticColorButton_setChecked(entity me, float val)
 }
 void XonoticColorButton_loadCvars(entity me)
 {
-	if (!me.cvarName)
+	if (!me.controlledCvar)
 		return;
 
-	if(cvar_string(me.cvarName) == cvar_defstring(me.cvarName))
-		cvar_set(me.cvarName, ftos(16 * floor(random() * 15) + floor(random() * 15)));
+	if(cvar_string(me.controlledCvar) == cvar_defstring(me.controlledCvar))
+		cvar_set(me.controlledCvar, ftos(16 * floor(random() * 15) + floor(random() * 15)));
 
 	if(me.cvarPart == 1)
-		me.checked = (cvar(me.cvarName) & 240) == me.cvarValueFloat * 16;
+		me.checked = (cvar(me.controlledCvar) & 240) == me.cvarValueFloat * 16;
 	else
-		me.checked = (cvar(me.cvarName) & 15) == me.cvarValueFloat;
+		me.checked = (cvar(me.controlledCvar) & 15) == me.cvarValueFloat;
 }
 void XonoticColorButton_saveCvars(entity me)
 {
-	if (!me.cvarName)
+	if (!me.controlledCvar)
 		return;
 
 	if(me.checked)
 	{
 		if(me.cvarPart == 1)
-			cvar_set(me.cvarName, ftos((cvar(me.cvarName) & 15) + me.cvarValueFloat * 16));
+			cvar_set(me.controlledCvar, ftos((cvar(me.controlledCvar) & 15) + me.cvarValueFloat * 16));
 		else
-			cvar_set(me.cvarName, ftos((cvar(me.cvarName) & 240) + me.cvarValueFloat));
+			cvar_set(me.controlledCvar, ftos((cvar(me.controlledCvar) & 240) + me.cvarValueFloat));
 	}
-	// TODO on an apply button, read _cl_color and execute the color command for it
 }
 void XonoticColorButton_draw(entity me)
 {