Merge branch 'master' into develop

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / textslider.qh

diff --git a/qcsrc/menu/xonotic/textslider.qh b/qcsrc/menu/xonotic/textslider.qh
index 58fe8e86bbe4a0becaac10ea463fe493f50b2d72..5b4691e268bf367804d148d275b913159324bfe9 100644 (file)
--- a/qcsrc/menu/xonotic/textslider.qh
+++ b/qcsrc/menu/xonotic/textslider.qh
@@ -9,7 +9,7 @@ CLASS(XonoticTextSlider, TextSlider)
        ATTRIB(XonoticTextSlider, fontSize, float, SKINFONTSIZE_NORMAL);
        ATTRIB(XonoticTextSlider, valueSpace, float, SKINWIDTH_SLIDERTEXT);
        ATTRIB(XonoticTextSlider, image, string, SKINGFX_SLIDER);
-       ATTRIB(XonoticTextSlider, tolerance, vector, SKINTOLERANCE_SLIDER);
+       ATTRIB(XonoticTextSlider, tolerance, vector, '0.2 2 0');
        ATTRIB(XonoticTextSlider, align, float, 0.5);
        ATTRIB(XonoticTextSlider, color, vector, SKINCOLOR_SLIDER_N);
        ATTRIB(XonoticTextSlider, colorC, vector, SKINCOLOR_SLIDER_C);
@@ -17,7 +17,7 @@ CLASS(XonoticTextSlider, TextSlider)
        ATTRIB(XonoticTextSlider, colorD, vector, SKINCOLOR_SLIDER_D);
        ATTRIB(XonoticTextSlider, color2, vector, SKINCOLOR_SLIDER_S);
 
-       ATTRIB(XonoticTextSlider, cvarName, string);
+       ATTRIB(XonoticTextSlider, controlledCvar, string);
        METHOD(XonoticTextSlider, loadCvars, void(entity));
        METHOD(XonoticTextSlider, saveCvars, void(entity));
        ATTRIB(XonoticTextSlider, sendCvars, float, 0);