X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Ftextslider.c;h=3fee2bf558374b36d525f528ec3bad114c64c5c4;hb=9d0acc2e4117dc6d1810a034c635a631cec501a8;hp=69270a67ac11f3e7f0419b07c7a52c40d5fb5d41;hpb=6d81ab64afd3d9980ff963edb261c03554fdfddb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/textslider.c b/qcsrc/menu/xonotic/textslider.c
index 69270a67a..3fee2bf55 100644
--- a/qcsrc/menu/xonotic/textslider.c
+++ b/qcsrc/menu/xonotic/textslider.c
@@ -6,13 +6,13 @@ CLASS(XonoticTextSlider) EXTENDS(TextSlider)
 	ATTRIB(XonoticTextSlider, fontSize, float, SKINFONTSIZE_NORMAL)
 	ATTRIB(XonoticTextSlider, valueSpace, float, SKINWIDTH_SLIDERTEXT)
 	ATTRIB(XonoticTextSlider, image, string, SKINGFX_SLIDER)
-	ATTRIB(XonoticSlider, tolerance, vector, SKINTOLERANCE_SLIDER)
+	ATTRIB(XonoticTextSlider, tolerance, vector, SKINTOLERANCE_SLIDER)
 	ATTRIB(XonoticTextSlider, align, float, 0.5)
-	ATTRIB(XonoticSlider, color, vector, SKINCOLOR_SLIDER_N)
-	ATTRIB(XonoticSlider, colorC, vector, SKINCOLOR_SLIDER_C)
-	ATTRIB(XonoticSlider, colorF, vector, SKINCOLOR_SLIDER_F)
-	ATTRIB(XonoticSlider, colorD, vector, SKINCOLOR_SLIDER_D)
-	ATTRIB(XonoticSlider, color2, vector, SKINCOLOR_SLIDER_S)
+	ATTRIB(XonoticTextSlider, color, vector, SKINCOLOR_SLIDER_N)
+	ATTRIB(XonoticTextSlider, colorC, vector, SKINCOLOR_SLIDER_C)
+	ATTRIB(XonoticTextSlider, colorF, vector, SKINCOLOR_SLIDER_F)
+	ATTRIB(XonoticTextSlider, colorD, vector, SKINCOLOR_SLIDER_D)
+	ATTRIB(XonoticTextSlider, color2, vector, SKINCOLOR_SLIDER_S)
 
 	ATTRIB(XonoticTextSlider, cvarName, string, string_null)
 	METHOD(XonoticTextSlider, loadCvars, void(entity))
@@ -61,6 +61,16 @@ void XonoticTextSlider_loadCvars(entity me)
 	for(i = 1; i < n; ++i)
 		s = strcat(s, " ", cvar_string(argv(i)));
 	me.setValueFromIdentifier(me, s);
+	if(me.value < 0 && n > 1)
+	{
+		// if it failed: check if all cvars have the same value
+		// if yes, try its value as 1-word identifier
+		for(i = 1; i < n; ++i)
+			if(cvar_string(argv(i)) != cvar_string(argv(i-1)))
+				break;
+		if(i >= n)
+			me.setValueFromIdentifier(me, cvar_string(argv(0)));
+	}
 }
 void XonoticTextSlider_saveCvars(entity me)
 {