Merge branch 'master' into Mario/hagar_notfixed

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

diff --git a/qcsrc/menu/xonotic/nexposee.qc b/qcsrc/menu/xonotic/nexposee.qc
index b375393c02a30047a31ed6442a0c7d16d6bc4a5a..7c2bcacd9f9fcd25d5714db7a774571e1f1c4d8f 100644 (file)
--- a/qcsrc/menu/xonotic/nexposee.qc
+++ b/qcsrc/menu/xonotic/nexposee.qc
@@ -1,16 +1,9 @@
-#ifdef INTERFACE
-CLASS(XonoticNexposee) EXTENDS(Nexposee)
-       METHOD(XonoticNexposee, configureXonoticNexposee, void(entity))
-       METHOD(XonoticNexposee, close, void(entity))
-ENDCLASS(XonoticNexposee)
-entity makeXonoticNexposee();
-#endif
+#include "nexposee.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticNexposee()
 {
        entity me;
-       me = spawnXonoticNexposee();
+       me = NEW(XonoticNexposee);
        me.configureXonoticNexposee(me);
        return me;
 }
@@ -23,4 +16,3 @@ void XonoticNexposee_close(entity me)
 {
        m_goto(string_null); // hide
 }
-#endif