X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Ftextslider.qc;h=597772e340019f4d58077158dc710b619e3b5944;hb=c89dfaa4d0342b98c320621557973a65114fbdf4;hp=8864654040e97242cd5ecab4aef2a576ef7cc785;hpb=8d10ea819c27736320d03e75134af341f8127199;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/xonotic/textslider.qc b/qcsrc/menu/xonotic/textslider.qc index 886465404..597772e34 100644 --- a/qcsrc/menu/xonotic/textslider.qc +++ b/qcsrc/menu/xonotic/textslider.qc @@ -2,7 +2,7 @@ #define TEXTSLIDER_H #include "../item/textslider.qc" CLASS(XonoticTextSlider, TextSlider) - METHOD(XonoticTextSlider, configureXonoticTextSlider, void(entity, string)); + METHOD(XonoticTextSlider, configureXonoticTextSlider, void(entity, string, string)); METHOD(XonoticTextSlider, setValue, void(entity, float)); METHOD(XonoticTextSlider, configureXonoticTextSliderValues, void(entity)); ATTRIB(XonoticTextSlider, fontSize, float, SKINFONTSIZE_NORMAL) @@ -24,26 +24,28 @@ CLASS(XonoticTextSlider, TextSlider) ATTRIB(XonoticTextSlider, alpha, float, SKINALPHA_TEXT) ATTRIB(XonoticTextSlider, disabledAlpha, float, SKINALPHA_DISABLED) ENDCLASS(XonoticTextSlider) +entity makeXonoticTextSlider_T(string, string theTooltip); entity makeXonoticTextSlider(string); // note: you still need to call addValue and configureXonoticTextSliderValues! #endif #ifdef IMPLEMENTATION -entity makeXonoticTextSlider(string theCvar) +entity makeXonoticTextSlider_T(string theCvar, string theTooltip) { entity me; me = NEW(XonoticTextSlider); - me.configureXonoticTextSlider(me, theCvar); + me.configureXonoticTextSlider(me, theCvar, theTooltip); return me; } -void XonoticTextSlider_configureXonoticTextSlider(entity me, string theCvar) +entity makeXonoticTextSlider(string theCvar) +{ + return makeXonoticTextSlider_T(theCvar, string_null); +} +void XonoticTextSlider_configureXonoticTextSlider(entity me, string theCvar, string theTooltip) { me.configureSliderVisuals(me, me.fontSize, me.align, me.valueSpace, me.image); - if(theCvar) - { - me.cvarName = theCvar; - me.tooltip = getZonedTooltipForIdentifier(theCvar); - // don't load it yet - } + me.cvarName = (theCvar) ? theCvar : string_null; + // me.loadCvars(me); // don't load it yet + setZonedTooltip(me, theTooltip, theCvar); } void XonoticTextSlider_setValue(entity me, float val) {