Merge branch 'master' into terencehill/translated_keys

[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..f99fc5d94c30079c5c77cc04f07524297d8d99f1 100644 (file)
--- a/qcsrc/menu/xonotic/image.qc
+++ b/qcsrc/menu/xonotic/image.qc
@@ -1,15 +1,9 @@
-#ifdef INTERFACE
-CLASS(XonoticImage) EXTENDS(Image)
-       METHOD(XonoticImage, configureXonoticImage, void(entity, string, float))
-ENDCLASS(XonoticImage)
-entity makeXonoticImage(string theImage, float theAspect);
-#endif
+#include "image.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticImage(string theImage, float theAspect)
 {
        entity me;
-       me = spawnXonoticImage();
+       me = NEW(XonoticImage);
        me.configureXonoticImage(me, theImage, theAspect);
        return me;
 }
@@ -18,4 +12,3 @@ void XonoticImage_configureXonoticImage(entity me, string theImage, float theAsp
        me.configureImage(me, theImage);
        me.forcedAspect = theAspect;
 }
-#endif