X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcolorbutton.c;h=bcbdfee8db9d3585a4aa4e51567492207cd392bc;hp=4e81a4acc24d2aa7d5ecce525e54d15090e307ce;hb=a035d049951445f892a37bfdef3e738f8a18e8b9;hpb=a7b24450e4c7ca75636df1375d01d2266bd00c8c

diff --git a/qcsrc/menu/xonotic/colorbutton.c b/qcsrc/menu/xonotic/colorbutton.c
index 4e81a4acc..bcbdfee8d 100644
--- a/qcsrc/menu/xonotic/colorbutton.c
+++ b/qcsrc/menu/xonotic/colorbutton.c
@@ -3,9 +3,8 @@ CLASS(XonoticColorButton) EXTENDS(RadioButton)
 	METHOD(XonoticColorButton, configureXonoticColorButton, void(entity, float, float, float))
 	METHOD(XonoticColorButton, setChecked, void(entity, float))
 	METHOD(XonoticColorButton, draw, void(entity))
-	ATTRIB(XonoticColorButton, fontSize, float, SKINFONTSIZE_NORMAL)
+	ATTRIB(XonoticColorButton, fontSize, float, 0)
 	ATTRIB(XonoticColorButton, image, string, SKINGFX_COLORBUTTON)
-	ATTRIB(XonoticColorButton, image2, string, SKINGFX_COLORBUTTON_COLOR)
 
 	ATTRIB(XonoticColorButton, useDownAsChecked, float, 1)
 
@@ -54,8 +53,6 @@ void XonoticColorButton_configureXonoticColorButton(entity me, float theGroup, f
 	me.cvarPart = theColor;
 	me.loadCvars(me);
 	me.configureRadioButton(me, string_null, me.fontSize, me.image, theGroup, 0);
-	me.srcMulti = 1;
-	me.src2 = me.image2;
 }
 void XonoticColorButton_setChecked(entity me, float val)
 {
@@ -67,9 +64,12 @@ void XonoticColorButton_setChecked(entity me, float val)
 }
 void XonoticColorButton_loadCvars(entity me)
 {
-	if not(me.cvarName)
+	if (!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
@@ -77,21 +77,24 @@ void XonoticColorButton_loadCvars(entity me)
 }
 void XonoticColorButton_saveCvars(entity me)
 {
-	if not(me.cvarName)
+	if (!me.cvarName)
 		return;
 
 	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
 }
 void XonoticColorButton_draw(entity me)
 {
-	me.color2 = colormapPaletteColor(me.cvarValueFloat, me.cvarPart);
+	me.color  = colormapPaletteColor(me.cvarValueFloat, me.cvarPart);
+	me.colorC = me.color;
+	me.colorF = me.color;
+	me.colorD = me.color;
 	SUPER(XonoticColorButton).draw(me);
 }
 #endif