Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title

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

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
index 1ec0c76e9e7b35fff87ed408a40de939a55d0b57..03ffd0f36dc361d814707081bb8b6efd18eb9890 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
@@ -1,7 +1,8 @@
-#ifdef INTERFACE
-CLASS(XonoticMediaTab) EXTENDS(XonoticTab)
+#ifndef DIALOG_MULTIPLAYER_MEDIA_H
+#define DIALOG_MULTIPLAYER_MEDIA_H
+#include "tab.qc"
+CLASS(XonoticMediaTab, XonoticTab)

        METHOD(XonoticMediaTab, fill, void(entity))
        METHOD(XonoticMediaTab, fill, void(entity))

-       ATTRIB(XonoticMediaTab, title, string, _("Media"))

        ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMediaTab, rows, float, 23)
        ATTRIB(XonoticMediaTab, columns, float, 3)
        ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMediaTab, rows, float, 23)
        ATTRIB(XonoticMediaTab, columns, float, 3)


@@ -14,7 +15,7 @@ entity makeXonoticMediaTab();
 entity makeXonoticMediaTab()
 {
        entity me;
 entity makeXonoticMediaTab()
 {
        entity me;

-       me = spawnXonoticMediaTab();
+       me = NEW(XonoticMediaTab);

        me.configureDialog(me);
        return me;
 }
        me.configureDialog(me);
        return me;
 }