Merge branch 'martin-t/shield' into 'master'

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

diff --git a/qcsrc/menu/xonotic/crosshairpreview.qc b/qcsrc/menu/xonotic/crosshairpreview.qc
index b271f4dab39093703e36737d7e544646beb3fbd2..e11d7dcc0f04d4f9401edbb4d16273b823162542 100644 (file)
--- a/qcsrc/menu/xonotic/crosshairpreview.qc
+++ b/qcsrc/menu/xonotic/crosshairpreview.qc
@@ -1,20 +1,9 @@
-#ifdef INTERFACE
-CLASS(XonoticCrosshairPreview) EXTENDS(Item)
-       METHOD(XonoticCrosshairPreview, configureXonoticCrosshairPreview, void(entity))
-       METHOD(XonoticCrosshairPreview, draw, void(entity))
-       ATTRIB(XonoticCrosshairPreview, src, string, string_null)
-       ATTRIB(XonoticCrosshairPreview, src2, string, string_null)
-       ATTRIB(XonoticCrosshairPreview, disabled, float, 0)
-       ATTRIB(XonoticCrosshairPreview, disabledAlpha, float, SKINALPHA_DISABLED)
-ENDCLASS(XonoticCrosshairPreview)
-entity makeXonoticCrosshairPreview();
-#endif
-
-#ifdef IMPLEMENTATION
+#include "crosshairpreview.qh"
+
 entity makeXonoticCrosshairPreview()
 {
        entity me;
-       me = spawnXonoticCrosshairPreview();
+       me = NEW(XonoticCrosshairPreview);
        me.configureXonoticCrosshairPreview(me);
        return me;
 }
@@ -57,4 +46,3 @@ void XonoticCrosshairPreview_draw(entity me)
 
        SUPER(XonoticCrosshairPreview).draw(me);
 }
-#endif