Merge branch 'master' into TimePath/scrollpanel

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

diff --git a/qcsrc/menu/xonotic/slider_particles.qc b/qcsrc/menu/xonotic/slider_particles.qc
index 0b2179d36eeede5497291f0afe6b8de486aed76e..72639fcb1ca93ddd504d34c262d3a5d8854ace78 100644 (file)
--- a/qcsrc/menu/xonotic/slider_particles.qc
+++ b/qcsrc/menu/xonotic/slider_particles.qc
@@ -1,15 +1,5 @@
-#ifndef SLIDER_PARTICLES_H
-#define SLIDER_PARTICLES_H
-#include "textslider.qc"
-CLASS(XonoticParticlesSlider, XonoticTextSlider)
-       METHOD(XonoticParticlesSlider, configureXonoticParticlesSlider, void(entity));
-       METHOD(XonoticParticlesSlider, loadCvars, void(entity));
-       METHOD(XonoticParticlesSlider, saveCvars, void(entity));
-ENDCLASS(XonoticParticlesSlider)
-entity makeXonoticParticlesSlider();
-#endif
+#include "slider_particles.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticParticlesSlider()
 {
        entity me;
@@ -20,19 +10,19 @@ entity makeXonoticParticlesSlider()
 void XonoticParticlesSlider_configureXonoticParticlesSlider(entity me)
 {
        me.configureXonoticTextSlider(me, "cl_particles_quality",
-               _("Multiplier for amount of particles. Less means less particles, which in turn gives for better performance (default: 1)"));
-       if(cvar("developer")) { me.addValue(me, ZCTX(_("PART^OMG")),      "0.4 250 0"); }
-       me.addValue(me,                         ZCTX(_("PART^Low")),      "0.4 500 0");
-       me.addValue(me,                         ZCTX(_("PART^Medium")),   "0.8 750 0");
+               _("Multiplier for amount of particles. Less means less particles, which in turn gives for better performance"));
+       if(cvar("developer")) { me.addValue(me, ZCTX(_("PART^OMG")),      "0.25 250 0"); }
+       me.addValue(me,                         ZCTX(_("PART^Low")),      "0.5 500 0");
+       me.addValue(me,                         ZCTX(_("PART^Medium")),   "0.75 750 0");
        me.addValue(me,                         ZCTX(_("PART^Normal")),   "1.0 1000 1");
-       me.addValue(me,                         ZCTX(_("PART^High")),     "1.0 1500 1");
-       me.addValue(me,                         ZCTX(_("PART^Ultra")),    "1.0 2000 2");
-       if(cvar("developer")) { me.addValue(me, ZCTX(_("PART^Ultimate")), "1.0 3000 2"); }
+       me.addValue(me,                         ZCTX(_("PART^High")),     "1.5 1500 1");
+       me.addValue(me,                         ZCTX(_("PART^Ultra")),    "2.0 2000 2");
+       if(cvar("developer")) { me.addValue(me, ZCTX(_("PART^Ultimate")), "3.0 3000 2"); }
        me.configureXonoticTextSliderValues(me);
 }
 void XonoticParticlesSlider_loadCvars(entity me)
 {
-       me.setValueFromIdentifier(me, sprintf("%s %s %s",
+       me.setValueFromIdentifier_noAnim(me, sprintf("%s %s %s",
                cvar_string("cl_particles_quality"),
                cvar_string("r_drawparticles_drawdistance"),
                cvar_string("cl_damageeffect")
@@ -48,4 +38,3 @@ void XonoticParticlesSlider_saveCvars(entity me)
                cvar_set("cl_damageeffect", argv(2));
        }
 }
-#endif