Merge branch 'TimePath/logging' into 'master'

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

diff --git a/qcsrc/menu/xonotic/image.qc b/qcsrc/menu/xonotic/image.qc
index 9f0de67b8a1deb592ddf0aff2eb8c6f5b03097d0..1f25899c142840647bec37c509e399dfd646aec7 100644 (file)
--- a/qcsrc/menu/xonotic/image.qc
+++ b/qcsrc/menu/xonotic/image.qc
@@ -1,6 +1,8 @@
-#ifdef INTERFACE
-CLASS(XonoticImage) EXTENDS(Image)
-       METHOD(XonoticImage, configureXonoticImage, void(entity, string, float))
+#ifndef IMAGE_H
+#define IMAGE_H
+#include "../item/image.qc"
+CLASS(XonoticImage, Image)
+       METHOD(XonoticImage, configureXonoticImage, void(entity, string, float));
 ENDCLASS(XonoticImage)
 entity makeXonoticImage(string theImage, float theAspect);
 #endif
@@ -9,7 +11,7 @@ entity makeXonoticImage(string theImage, float theAspect);
 entity makeXonoticImage(string theImage, float theAspect)
 {
        entity me;
-       me = spawnXonoticImage();
+       me = NEW(XonoticImage);
        me.configureXonoticImage(me, theImage, theAspect);
        return me;
 }