Merge branch 'master' into terencehill/quickmenu

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

diff --git a/qcsrc/menu/xonotic/gametypelist.qc b/qcsrc/menu/xonotic/gametypelist.qc
index 0d36c836340f7b463d2c0af41c9197990ec67619..d8dbc8838ea5bdb709931008cf7f3207a614ad9a 100644 (file)
--- a/qcsrc/menu/xonotic/gametypelist.qc
+++ b/qcsrc/menu/xonotic/gametypelist.qc
@@ -1,5 +1,7 @@
-#ifdef INTERFACE
-CLASS(XonoticGametypeList) EXTENDS(XonoticListBox)
+#ifndef GAMETYPELIST_H
+#define GAMETYPELIST_H
+#include "listbox.qc"
+CLASS(XonoticGametypeList, XonoticListBox)
        METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity))
        ATTRIB(XonoticGametypeList, rowsPerItem, float, 2)
        METHOD(XonoticGametypeList, drawListBoxItem, void(entity, float, vector, float))
@@ -25,7 +27,7 @@ entity makeXonoticGametypeList();
 entity makeXonoticGametypeList(void)
 {
        entity me;
-       me = spawnXonoticGametypeList();
+       me = NEW(XonoticGametypeList);
        me.configureXonoticGametypeList(me);
        return me;
 }