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

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

diff --git a/qcsrc/menu/xonotic/crosshairpicker.qc b/qcsrc/menu/xonotic/crosshairpicker.qc
index 2f2c35507823fe090c1ec014fe3056376b494c40..8922e7fbf4d3c4fbf5fa367ee64b4adb2ee82ac4 100644 (file)
--- a/qcsrc/menu/xonotic/crosshairpicker.qc
+++ b/qcsrc/menu/xonotic/crosshairpicker.qc
@@ -1,5 +1,7 @@
-#ifdef INTERFACE
-CLASS(XonoticCrosshairPicker) EXTENDS(XonoticPicker)
+#ifndef CROSSHAIRPICKER_H
+#define CROSSHAIRPICKER_H
+#include "picker.qc"
+CLASS(XonoticCrosshairPicker, XonoticPicker)
        METHOD(XonoticCrosshairPicker, configureXonoticCrosshairPicker, void(entity))
 
        ATTRIB(XonoticCrosshairPicker, rows, float, 3)
@@ -32,7 +34,7 @@ vector crosshairpicker_crosshairToCell(entity me, string crosshair_str)
 entity makeXonoticCrosshairPicker()
 {
        entity me;
-       me = spawnXonoticCrosshairPicker();
+       me = NEW(XonoticCrosshairPicker);
        me.configureXonoticCrosshairPicker(me);
        return me;
 }