Merge branch 'master' into DefaultUser/waypoint_icons

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

diff --git a/qcsrc/menu/xonotic/weaponarenacheckbox.qc b/qcsrc/menu/xonotic/weaponarenacheckbox.qc
index 163f9c63b43ed7ce2ba98a05b7a0819085bf550a..fd4f51385bb898cf74fd498b1bc13b3673c02805 100644 (file)
--- a/qcsrc/menu/xonotic/weaponarenacheckbox.qc
+++ b/qcsrc/menu/xonotic/weaponarenacheckbox.qc
@@ -1,29 +1,16 @@
-#ifdef INTERFACE
-CLASS(XonoticWeaponarenaCheckBox) EXTENDS(CheckBox)
-       METHOD(XonoticWeaponarenaCheckBox, configureXonoticWeaponarenaCheckBox, void(entity, string, string))
-       METHOD(XonoticWeaponarenaCheckBox, setChecked, void(entity, float))
-       ATTRIB(XonoticWeaponarenaCheckBox, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticWeaponarenaCheckBox, image, string, SKINGFX_CHECKBOX)
-       ATTRIB(XonoticWeaponarenaCheckBox, netname, string, string_null)
+#include "weaponarenacheckbox.qh"
 
-       METHOD(XonoticWeaponarenaCheckBox, loadCvars, void(entity))
-       METHOD(XonoticWeaponarenaCheckBox, saveCvars, void(entity))
-ENDCLASS(XonoticWeaponarenaCheckBox)
-entity makeXonoticWeaponarenaCheckBox(string, string);
-#endif
-
-#ifdef IMPLEMENTATION
 entity makeXonoticWeaponarenaCheckBox(string theWeapon, string theText)
 {
        entity me;
-       me = spawnXonoticWeaponarenaCheckBox();
+       me = NEW(XonoticWeaponarenaCheckBox);
        me.configureXonoticWeaponarenaCheckBox(me, theWeapon, theText);
        return me;
 }
 void XonoticWeaponarenaCheckBox_configureXonoticWeaponarenaCheckBox(entity me, string theWeapon, string theText)
 {
        me.netname = theWeapon;
-       me.checked = FALSE;
+       me.checked = false;
        me.loadCvars(me);
        me.configureCheckBox(me, theText, me.fontSize, me.image);
 }
@@ -40,7 +27,7 @@ void XonoticWeaponarenaCheckBox_loadCvars(entity me)
        {
                if(argv(i) == me.netname)
                {
-                       me.checked = TRUE;
+                       me.checked = true;
                        break;
                }
        }
@@ -54,4 +41,3 @@ void XonoticWeaponarenaCheckBox_saveCvars(entity me)
                localcmd(strcat("\nmenu_cmd removefromlist menu_weaponarena ", me.netname, "\n"));
        localcmd("\ng_weaponarena \"$menu_weaponarena\"\n");
 }
-#endif