Merge branch 'master' into Mirio/balance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / slider_decibels.qc

diff --git a/qcsrc/menu/xonotic/slider_decibels.qc b/qcsrc/menu/xonotic/slider_decibels.qc
index bf847e31264765b9a4ed63e200c0ba80505ada51..2b78141383d28579d157c5d583addf039427f90d 100644 (file)
--- a/qcsrc/menu/xonotic/slider_decibels.qc
+++ b/qcsrc/menu/xonotic/slider_decibels.qc
@@ -1,13 +1,4 @@
-#ifdef INTERFACE
-CLASS(XonoticDecibelsSlider) EXTENDS(XonoticSlider)
-       METHOD(XonoticDecibelsSlider, loadCvars, void(entity))
-       METHOD(XonoticDecibelsSlider, saveCvars, void(entity))
-       METHOD(XonoticDecibelsSlider, valueToText, string(entity, float))
-ENDCLASS(XonoticDecibelsSlider)
-entity makeXonoticDecibelsSlider(float, float, float, string);
-#endif
-
-#ifdef IMPLEMENTATION
+#include "slider_decibels.qh"
 
 float toDecibelOfSquare(float f, float mi)
 {
@@ -37,13 +28,17 @@ float fromDecibelOfSquare(float f, float mi)
        return exp(A * f);
 }
 
-entity makeXonoticDecibelsSlider(float theValueMin, float theValueMax, float theValueStep, string theCvar)
+entity makeXonoticDecibelsSlider_T(float theValueMin, float theValueMax, float theValueStep, string theCvar, string theTooltip)
 {
        entity me;
-       me = spawnXonoticDecibelsSlider();
-       me.configureXonoticSlider(me, theValueMin, theValueMax, theValueStep, theCvar);
+       me = NEW(XonoticDecibelsSlider);
+       me.configureXonoticSlider(me, theValueMin, theValueMax, theValueStep, theCvar, theTooltip);
        return me;
 }
+entity makeXonoticDecibelsSlider(float theValueMin, float theValueMax, float theValueStep, string theCvar)
+{
+       return makeXonoticDecibelsSlider_T(theValueMin, theValueMax, theValueStep, theCvar, string_null);
+}
 void XonoticDecibelsSlider_loadCvars(entity me)
 {
        float v;
@@ -55,9 +50,9 @@ void XonoticDecibelsSlider_loadCvars(entity me)
 
        // snapping
        if(v > fromDecibelOfSquare(me.valueMax - 0.5 * me.valueStep, me.valueMin))
-               Slider_setValue(me, me.valueMax);
+               Slider_setValue_noAnim(me, me.valueMax);
        else
-               Slider_setValue(me, me.valueStep * floor(0.5 + toDecibelOfSquare(v, me.valueMin) / me.valueStep) );
+               Slider_setValue_noAnim(me, me.valueStep * floor(0.5 + toDecibelOfSquare(v, me.valueMin) / me.valueStep));
 }
 void XonoticDecibelsSlider_saveCvars(entity me)
 {
@@ -87,19 +82,18 @@ string XonoticDecibelsSlider_valueToText(entity me, float v)
                return sprintf(_("%s dB"), ftos_decimals(toDecibelOfSquare(fromDecibelOfSquare(v, me.valueMin), 0), me.valueDigits));
 }
 
-void _TEST_XonoticDecibelsSlider()
+bool autocvar_test_XonoticDecibelsSlider = false;
+TEST(XonoticDecibelsSlider, SoundTest)
 {
-       float i;
-       for(i = -400; i < 0; ++i)
+       if (!autocvar_test_XonoticDecibelsSlider) { SUCCEED(); return; }
+       for (int i = -400; i < 0; ++i)
        {
                float db = i * 0.1;
                float v = fromDecibelOfSquare(db, -40);
                float dbv = toDecibelOfSquare(v, -40);
                float d = dbv - db;
-               printf("%f -> %f -> %f (diff: %f)\n", db, v, dbv, d);
-               TEST_Check(fabs(d) > 0.02);
+               LOG_INFOF("%f -> %f -> %f (diff: %f)\n", db, v, dbv, d);
+               EXPECT_GT(fabs(d), 0.02);
        }
-       TEST_OK();
+       SUCCEED();
 }
-
-#endif