Merge branch 'bones_was_here/font' into 'master'

[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 abecd1ed5bd18e27576748b3ebc0f6dd0c2287e8..bc379d3b93adbb0e43646d4a92c38c11b7ba3593 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
@@ -1,17 +1,14 @@
-#ifndef DIALOG_MULTIPLAYER_MEDIA_H
-#define DIALOG_MULTIPLAYER_MEDIA_H
-#include "tab.qc"
-CLASS(XonoticMediaTab, XonoticTab)
-       METHOD(XonoticMediaTab, fill, void(entity));
-       ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticMediaTab, rows, float, 23)
-       ATTRIB(XonoticMediaTab, columns, float, 3)
-       ATTRIB(XonoticMediaTab, name, string, "Media")
-ENDCLASS(XonoticMediaTab)
-entity makeXonoticMediaTab();
-#endif
+#include "dialog_multiplayer_media.qh"
+
+#include "demolist.qh"
+#include "dialog_multiplayer_media_demo.qh"
+#include "dialog_multiplayer_media_screenshot.qh"
+#include "dialog_multiplayer_media_musicplayer.qh"
+#include "dialog_multiplayer_media_demo_timeconfirm.qh"
+#include "dialog_multiplayer_media_demo_startconfirm.qh"
+
+#include "tabcontroller.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticMediaTab()
 {
        entity me;
@@ -32,4 +29,3 @@ void XonoticMediaTab_fill(entity me)
        me.gotoRC(me, 3, 0);
                me.TD(me, me.rows - 2, me.columns, mc);
 }
-#endif