Restore white tos text

[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 950661d73dc8d33699eccbca95191b213626872a..49bffed257acf362a993bd3d6e00f5303f40eb1c 100644 (file)
--- a/qcsrc/menu/xonotic/colorbutton.qc
+++ b/qcsrc/menu/xonotic/colorbutton.qc
@@ -1,25 +1,5 @@
-#ifndef COLORBUTTON_H
-#define COLORBUTTON_H
-#include "../item/radiobutton.qc"
-CLASS(XonoticColorButton, RadioButton)
-       METHOD(XonoticColorButton, configureXonoticColorButton, void(entity, float, float, float))
-       METHOD(XonoticColorButton, setChecked, void(entity, float))
-       METHOD(XonoticColorButton, draw, void(entity))
-       ATTRIB(XonoticColorButton, fontSize, float, 0)
-       ATTRIB(XonoticColorButton, image, string, SKINGFX_COLORBUTTON)
+#include "colorbutton.qh"
 
-       ATTRIB(XonoticColorButton, useDownAsChecked, float, 1)
-
-       ATTRIB(XonoticColorButton, cvarPart, float, 0)
-       ATTRIB(XonoticColorButton, cvarName, string, string_null)
-       ATTRIB(XonoticColorButton, cvarValueFloat, float, 0)
-       METHOD(XonoticColorButton, loadCvars, void(entity))
-       METHOD(XonoticColorButton, saveCvars, void(entity))
-ENDCLASS(XonoticColorButton)
-entity makeXonoticColorButton(float, float, float);
-#endif
-
-#ifdef IMPLEMENTATION
 entity makeXonoticColorButton(float theGroup, float theColor, float theValue)
 {
        entity me;
@@ -50,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);
@@ -66,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)
 {
@@ -99,4 +78,3 @@ void XonoticColorButton_draw(entity me)
        me.colorD = me.color;
        SUPER(XonoticColorButton).draw(me);
 }
-#endif