Impulses: migration pathway

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

diff --git a/qcsrc/menu/xonotic/gametypebutton.qc b/qcsrc/menu/xonotic/gametypebutton.qc
index ae202560c4b5c2de648f33d1a318cc05d45ed8ba..fb80866903247d7b7e64321dfdd40aa3c394b59f 100644 (file)
--- a/qcsrc/menu/xonotic/gametypebutton.qc
+++ b/qcsrc/menu/xonotic/gametypebutton.qc
@@ -2,8 +2,8 @@
 #define GAMETYPEBUTTON_H
 #include "../item/radiobutton.qc"
 CLASS(XonoticGametypeButton, RadioButton)
-       METHOD(XonoticGametypeButton, configureXonoticGametypeButton, void(entity, float, string, string))
-       METHOD(XonoticGametypeButton, setChecked, void(entity, float))
+       METHOD(XonoticGametypeButton, configureXonoticGametypeButton, void(entity, float, string, string));
+       METHOD(XonoticGametypeButton, setChecked, void(entity, float));
        ATTRIB(XonoticGametypeButton, fontSize, float, SKINFONTSIZE_NORMAL)
        ATTRIB(XonoticGametypeButton, image, string, SKINGFX_BUTTON_BIG)
        ATTRIB(XonoticGametypeButton, color, vector, SKINCOLOR_BUTTON_N)
@@ -14,8 +14,8 @@ CLASS(XonoticGametypeButton, RadioButton)
        ATTRIB(XonoticGametypeButton, useDownAsChecked, float, 1)
 
        ATTRIB(XonoticGametypeButton, cvarName, string, string_null)
-       METHOD(XonoticGametypeButton, loadCvars, void(entity))
-       METHOD(XonoticGametypeButton, saveCvars, void(entity))
+       METHOD(XonoticGametypeButton, loadCvars, void(entity));
+       METHOD(XonoticGametypeButton, saveCvars, void(entity));
 
        ATTRIB(XonoticGametypeButton, alpha, float, SKINALPHA_TEXT)
        ATTRIB(XonoticGametypeButton, disabledAlpha, float, SKINALPHA_DISABLED)
@@ -29,17 +29,14 @@ entity makeXonoticGametypeButton(float theGroup, string theCvar, string theText)
 {
        entity me;
        me = NEW(XonoticGametypeButton);
-       me.configureXonoticGametypeButton(me, theGroup, theCvar, theText);
+       me.configureXonoticGametypeButton(me, theGroup, theCvar, theText, theTooltip);
        return me;
 }
-void XonoticGametypeButton_configureXonoticGametypeButton(entity me, float theGroup, string theCvar, string theText)
+void XonoticGametypeButton_configureXonoticGametypeButton(entity me, float theGroup, string theCvar, string theText, string theTooltip)
 {
-       if(theCvar)
-       {
-               me.cvarName = theCvar;
-               me.tooltip = getZonedTooltipForIdentifier(theCvar);
-               me.loadCvars(me);
-       }
+       me.cvarName = (theCvar) ? theCvar : string_null;
+       me.loadCvars(me);
+       setZonedTooltip(me, theTooltip, theCvar);
        me.configureRadioButton(me, theText, me.fontSize, me.image, theGroup, 0);
        me.align = 0.5;
        me.onClick = GameTypeButton_Click;