Merge remote-tracking branch 'origin/divVerent/merged-translations'

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

diff --git a/qcsrc/menu/xonotic/colorbutton.c b/qcsrc/menu/xonotic/colorbutton.c
index 4e81a4acc24d2aa7d5ecce525e54d15090e307ce..fd19f280a4d408b51d8fa1e1fba9b68a488829ab 100644 (file)
--- a/qcsrc/menu/xonotic/colorbutton.c
+++ b/qcsrc/menu/xonotic/colorbutton.c
@@ -70,6 +70,9 @@ void XonoticColorButton_loadCvars(entity me)
        if not(me.cvarName)
                return;
 
+       if(cvar_string(me.cvarName) == cvar_defstring(me.cvarName))
+               cvar_set(me.cvarName, ftos(16 * floor(random() * 15) + floor(random() * 15)));
+
        if(me.cvarPart == 1)
                me.checked = (cvar(me.cvarName) & 240) == me.cvarValueFloat * 16;
        else
@@ -83,9 +86,9 @@ void XonoticColorButton_saveCvars(entity me)
        if(me.checked)
        {
                if(me.cvarPart == 1)
-                       cvar_set(me.cvarName, ftos(cvar(me.cvarName) & 15 + me.cvarValueFloat * 16));
+                       cvar_set(me.cvarName, ftos((cvar(me.cvarName) & 15) + me.cvarValueFloat * 16));
                else
-                       cvar_set(me.cvarName, ftos(cvar(me.cvarName) & 240 + me.cvarValueFloat));
+                       cvar_set(me.cvarName, ftos((cvar(me.cvarName) & 240) + me.cvarValueFloat));
        }
        // TODO on an apply button, read _cl_color and execute the color command for it
 }