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 f8de85798258502c058575e14f7afc05a120161d..e11d7dcc0f04d4f9401edbb4d16273b823162542 100644 (file)
--- a/qcsrc/menu/xonotic/crosshairpreview.qc
+++ b/qcsrc/menu/xonotic/crosshairpreview.qc
@@ -1,18 +1,5 @@
-#ifndef CROSSHAIRPREVIEW_H
-#define CROSSHAIRPREVIEW_H
-#include "../item.qc"
-CLASS(XonoticCrosshairPreview, 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;
@@ -59,4 +46,3 @@ void XonoticCrosshairPreview_draw(entity me)
 
        SUPER(XonoticCrosshairPreview).draw(me);
 }
-#endif