X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fslider_sbfadetime.qc;h=a07f6d7addeb564c5819edc539e3d98509e723ee;hb=abf4b5a430d71fc83abbe90da9b17b457a65e149;hp=39f91f933cf734ccdbee07587f8f9757e94c1f19;hpb=e921ae9f86a09d0a20cd4c72b44e6d71d25975ea;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/slider_sbfadetime.qc b/qcsrc/menu/xonotic/slider_sbfadetime.qc
index 39f91f933..a07f6d7ad 100644
--- a/qcsrc/menu/xonotic/slider_sbfadetime.qc
+++ b/qcsrc/menu/xonotic/slider_sbfadetime.qc
@@ -1,34 +1,26 @@
-#ifdef INTERFACE
-CLASS(XonoticScoreboardFadeTimeSlider) EXTENDS(XonoticTextSlider)
-	METHOD(XonoticScoreboardFadeTimeSlider, configureXonoticScoreboardFadeTimeSlider, void(entity))
-	METHOD(XonoticScoreboardFadeTimeSlider, loadCvars, void(entity))
-	METHOD(XonoticScoreboardFadeTimeSlider, saveCvars, void(entity))
-ENDCLASS(XonoticScoreboardFadeTimeSlider)
-entity makeXonoticScoreboardFadeTimeSlider();
-#endif
+#include "slider_sbfadetime.qh"
 
-#ifdef IMPLEMENTATION
 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.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");
-	me.addValue(me, ZCTX(_("PART^Instant")),  "0 0");
+	me.configureXonoticTextSlider(me, "hud_panel_scoreboard_fadeinspeed", string_null);
+	me.addValue(me, ZCTX(_("FADESPEED^Slow")),     "5 2.5");
+	me.addValue(me, ZCTX(_("FADESPEED^Normal")),   "10 5");
+	me.addValue(me, ZCTX(_("FADESPEED^Fast")),     "15 7.5");
+	me.addValue(me, ZCTX(_("FADESPEED^Instant")),  "0 0");
 	me.configureXonoticTextSliderValues(me);
 }
 void XonoticScoreboardFadeTimeSlider_loadCvars(entity me)
 {
-	me.setValueFromIdentifier(me, sprintf("%s %s",
-		cvar_string("scoreboard_fadeinspeed"),
-		cvar_string("scoreboard_fadeoutspeed")
+	me.setValueFromIdentifier_noAnim(me, sprintf("%s %s",
+		cvar_string("hud_panel_scoreboard_fadeinspeed"),
+		cvar_string("hud_panel_scoreboard_fadeoutspeed")
 	));
 }
 void XonoticScoreboardFadeTimeSlider_saveCvars(entity me)
@@ -36,8 +28,7 @@ void XonoticScoreboardFadeTimeSlider_saveCvars(entity me)
 	if(me.value >= 0 || me.value < me.nValues)
 	{
 		tokenize_console(me.getIdentifier(me));
-		cvar_set("scoreboard_fadeinspeed", argv(0));
-		cvar_set("scoreboard_fadeoutspeed", argv(1));
+		cvar_set("hud_panel_scoreboard_fadeinspeed", argv(0));
+		cvar_set("hud_panel_scoreboard_fadeoutspeed", argv(1));
 	}
 }
-#endif