Merge branch 'master' into terencehill/music_player

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

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media.c b/qcsrc/menu/xonotic/dialog_multiplayer_media.c
index 529727675d62420c1d44cdbf5abea8346f6d833e..a0b49b1f6619706ac91a54150654887bec0ae95d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.c
@@ -1,10 +1,10 @@
 #ifdef INTERFACE
 CLASS(XonoticMediaTab) EXTENDS(XonoticTab)
        METHOD(XonoticMediaTab, fill, void(entity))
-       ATTRIB(XonoticMediaTab, title, string, _("Demo"))
+       ATTRIB(XonoticMediaTab, title, string, _("Media"))
        ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMediaTab, rows, float, 23)
-       ATTRIB(XonoticMediaTab, columns, float, 2)
+       ATTRIB(XonoticMediaTab, columns, float, 3)
        ATTRIB(XonoticMediaTab, name, string, "Media")  
 ENDCLASS(XonoticMediaTab)
 entity makeXonoticMediaTab();
@@ -22,12 +22,13 @@ void XonoticMediaTab_fill(entity me)
 {
        entity mc, e;
        mc = makeXonoticTabController(me.rows - 2);
-       me.TR(me);
+
+       me.gotoRC(me, 0.5, 0);
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Demos"), makeXonoticDemoBrowserTab()));
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Screenshots"), makeXonoticScreenshotBrowserTab()));
+               me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Music Player"), makeXonoticMusicPlayerTab()));
 
-       me.TR(me);
-       me.TR(me);
+       me.gotoRC(me, 3, 0);
                me.TD(me, me.rows - 2, me.columns, mc);
 }
 #endif