Merge CLASS and EXTENDS, #define NEW(cname) (spawn##cname())

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

diff --git a/qcsrc/menu/xonotic/listbox.qc b/qcsrc/menu/xonotic/listbox.qc
index 0ab574fa2f1b3869422e5b137d6a49459695580b..d3897f5724e7da369208c95df2ff5f5f8fc4ece1 100644 (file)
--- a/qcsrc/menu/xonotic/listbox.qc
+++ b/qcsrc/menu/xonotic/listbox.qc
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticListBox) EXTENDS(ListBox)
+CLASS(XonoticListBox, ListBox)
        METHOD(XonoticListBox, configureXonoticListBox, void(entity))
        ATTRIB(XonoticListBox, fontSize, float, SKINFONTSIZE_NORMAL)
        ATTRIB(XonoticListBox, scrollbarWidth, float, SKINWIDTH_SCROLLBAR)
@@ -21,7 +21,7 @@ entity makeXonoticListBox();
 entity makeXonoticListBox()
 {
        entity me;
-       me = spawnXonoticListBox();
+       me = NEW(XonoticListBox);
        me.configureXonoticListBox(me);
        return me;
 }