X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fslider_sbfadetime.qc;h=ecf850f404f083b3548ed59138d7e34973c9ce80;hb=7bcb3a89b3271e018da4d92437dc5ba125ea8698;hp=39f91f933cf734ccdbee07587f8f9757e94c1f19;hpb=ea48961feb50159e05ef56f38b7fd0ebc15cc64e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/slider_sbfadetime.qc b/qcsrc/menu/xonotic/slider_sbfadetime.qc
index 39f91f933..ecf850f40 100644
--- a/qcsrc/menu/xonotic/slider_sbfadetime.qc
+++ b/qcsrc/menu/xonotic/slider_sbfadetime.qc
@@ -1,8 +1,10 @@
-#ifdef INTERFACE
-CLASS(XonoticScoreboardFadeTimeSlider) EXTENDS(XonoticTextSlider)
-	METHOD(XonoticScoreboardFadeTimeSlider, configureXonoticScoreboardFadeTimeSlider, void(entity))
-	METHOD(XonoticScoreboardFadeTimeSlider, loadCvars, void(entity))
-	METHOD(XonoticScoreboardFadeTimeSlider, saveCvars, void(entity))
+#ifndef SLIDER_SBFADETIME_H
+#define SLIDER_SBFADETIME_H
+#include "textslider.qc"
+CLASS(XonoticScoreboardFadeTimeSlider, XonoticTextSlider)
+	METHOD(XonoticScoreboardFadeTimeSlider, configureXonoticScoreboardFadeTimeSlider, void(entity));
+	METHOD(XonoticScoreboardFadeTimeSlider, loadCvars, void(entity));
+	METHOD(XonoticScoreboardFadeTimeSlider, saveCvars, void(entity));
 ENDCLASS(XonoticScoreboardFadeTimeSlider)
 entity makeXonoticScoreboardFadeTimeSlider();
 #endif
@@ -11,13 +13,13 @@ entity makeXonoticScoreboardFadeTimeSlider();
 entity makeXonoticScoreboardFadeTimeSlider()
 {
 	entity me;
-	me = spawnXonoticScoreboardFadeTimeSlider();
+	me = NEW(XonoticScoreboardFadeTimeSlider);
 	me.configureXonoticScoreboardFadeTimeSlider(me);
 	return me;
 }
 void XonoticScoreboardFadeTimeSlider_configureXonoticScoreboardFadeTimeSlider(entity me)
 {
-	me.configureXonoticTextSlider(me, "scoreboard_fadeinspeed");
+	me.configureXonoticTextSlider(me, "scoreboard_fadeinspeed", string_null);
 	me.addValue(me, ZCTX(_("PART^Slow")),     "5 2.5");
 	me.addValue(me, ZCTX(_("PART^Normal")),   "10 5");
 	me.addValue(me, ZCTX(_("PART^Fast")),     "15 7.5");
@@ -26,7 +28,7 @@ void XonoticScoreboardFadeTimeSlider_configureXonoticScoreboardFadeTimeSlider(en
 }
 void XonoticScoreboardFadeTimeSlider_loadCvars(entity me)
 {
-	me.setValueFromIdentifier(me, sprintf("%s %s",
+	me.setValueFromIdentifier_noAnim(me, sprintf("%s %s",
 		cvar_string("scoreboard_fadeinspeed"),
 		cvar_string("scoreboard_fadeoutspeed")
 	));