Merge remote-tracking branch 'origin/master' into terencehill/listbox_item_highlight

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

diff --git a/qcsrc/menu/xonotic/picker.qc b/qcsrc/menu/xonotic/picker.qc
index 77b9348627fa28b33b729135fee314bba9a614ef..9fe3f7f363cab77c2916aca315a0c6f637f8f720 100644 (file)
--- a/qcsrc/menu/xonotic/picker.qc
+++ b/qcsrc/menu/xonotic/picker.qc
@@ -1,5 +1,7 @@
-#ifdef INTERFACE
-CLASS(XonoticPicker) EXTENDS(Item)
+#ifndef PICKER_H
+#define PICKER_H
+#include "../item.qc"
+CLASS(XonoticPicker, Item)
        METHOD(XonoticPicker, configureXonoticPicker, void(entity))
        METHOD(XonoticPicker, mousePress, float(entity, vector))
        METHOD(XonoticPicker, mouseRelease, float(entity, vector))
@@ -34,7 +36,7 @@ entity makeXonoticPicker();
 entity makeXonoticPicker()
 {
        entity me;
-       me = spawnXonoticPicker();
+       me = NEW(XonoticPicker);
        me.configureXonoticPicker(me);
        return me;
 }