Add Archer to the credits

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

diff --git a/qcsrc/menu/xonotic/slider.c b/qcsrc/menu/xonotic/slider.c
index a2e22a553c02dfb3591140a19ac55f3072ace32d..aba15ecae625d244fda71f4eb60f9c623a61787b 100644 (file)
--- a/qcsrc/menu/xonotic/slider.c
+++ b/qcsrc/menu/xonotic/slider.c
@@ -31,25 +31,28 @@ entity makeXonoticSlider(float theValueMin, float theValueMax, float theValueSte
        me.configureXonoticSlider(me, theValueMin, theValueMax, theValueStep, theCvar);
        return me;
 }
-void configureXonoticSliderXonoticSlider(entity me, float theValueMin, float theValueMax, float theValueStep, string theCvar)
+void XonoticSlider_configureXonoticSlider(entity me, float theValueMin, float theValueMax, float theValueStep, string theCvar)
 {
-       float v, vk, vp;
-       v = theValueMin;
-       vk = theValueStep;
+       float vp;
        vp = theValueStep * 10;
        while(fabs(vp) < fabs(theValueMax - theValueMin) / 40)
                vp *= 10;
+
        me.configureSliderVisuals(me, me.fontSize, me.align, me.valueSpace, me.image);
-       me.configureSliderValues(me, theValueMin, v, theValueMax, theValueStep, vk, vp);
+
        if(theCvar)
        {
+               // Prevent flickering of the slider button by initialising the
+               // slider out of bounds to hide the button before loading the cvar
+               me.configureSliderValues(me, theValueMin, theValueMin-theValueStep, theValueMax, theValueStep, theValueStep, vp);
                me.cvarName = theCvar;
                me.loadCvars(me);
-               if(tooltipdb >= 0)
-                       me.tooltip = getZonedTooltipForIdentifier(theCvar);
+               me.tooltip = getZonedTooltipForIdentifier(theCvar);
        }
+       else
+               me.configureSliderValues(me, theValueMin, theValueMin, theValueMax, theValueStep, theValueStep, vp);
 }
-void setValueXonoticSlider(entity me, float val)
+void XonoticSlider_setValue(entity me, float val)
 {
        if(val != me.value)
        {
@@ -57,16 +60,16 @@ void setValueXonoticSlider(entity me, float val)
                me.saveCvars(me);
        }
 }
-void loadCvarsXonoticSlider(entity me)
+void XonoticSlider_loadCvars(entity me)
 {
-       if not(me.cvarName)
+       if (!me.cvarName)
                return;
 
        me.setValue( me, cvar(me.cvarName) );
 }
-void saveCvarsXonoticSlider(entity me)
+void XonoticSlider_saveCvars(entity me)
 {
-       if not(me.cvarName)
+       if (!me.cvarName)
                return;
 
        cvar_set(me.cvarName, ftos(me.value));