Don't show any tooltip with the name of the selected cvar in the cvar list as it...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / colorbutton.qc

diff --git a/qcsrc/menu/xonotic/colorbutton.qc b/qcsrc/menu/xonotic/colorbutton.qc
index f9db47f99a2a6c2646f9c874ab660087581ee945..49bffed257acf362a993bd3d6e00f5303f40eb1c 100644 (file)
--- 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,28 +46,28 @@ 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));
        }
 }
 void XonoticColorButton_draw(entity me)