X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fslider_sbfadetime.qc;h=a07f6d7addeb564c5819edc539e3d98509e723ee;hb=54c73db251372d28956d780656c4a0a78a2e54ca;hp=ecf850f404f083b3548ed59138d7e34973c9ce80;hpb=03f978544a8b13a18cef1c7cc3dbcaba1c3aee4c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/xonotic/slider_sbfadetime.qc b/qcsrc/menu/xonotic/slider_sbfadetime.qc index ecf850f40..a07f6d7ad 100644 --- a/qcsrc/menu/xonotic/slider_sbfadetime.qc +++ b/qcsrc/menu/xonotic/slider_sbfadetime.qc @@ -1,15 +1,5 @@ -#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 +#include "slider_sbfadetime.qh" -#ifdef IMPLEMENTATION entity makeXonoticScoreboardFadeTimeSlider() { entity me; @@ -19,18 +9,18 @@ entity makeXonoticScoreboardFadeTimeSlider() } void XonoticScoreboardFadeTimeSlider_configureXonoticScoreboardFadeTimeSlider(entity me) { - 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"); - 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_noAnim(me, sprintf("%s %s", - cvar_string("scoreboard_fadeinspeed"), - cvar_string("scoreboard_fadeoutspeed") + cvar_string("hud_panel_scoreboard_fadeinspeed"), + cvar_string("hud_panel_scoreboard_fadeoutspeed") )); } void XonoticScoreboardFadeTimeSlider_saveCvars(entity me) @@ -38,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