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

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

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
index 0b7e4231ce50e4c1742e79d17fbcf714145d228f..6c0791ff7ca66833470e02386876af59b5878774 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
@@ -1,7 +1,8 @@
-#ifdef INTERFACE
-CLASS(XonoticMusicPlayerTab) EXTENDS(XonoticTab)
+#ifndef DIALOG_MULTIPLAYER_MEDIA_MUSICPLAYER_H
+#define DIALOG_MULTIPLAYER_MEDIA_MUSICPLAYER_H
+#include "tab.qc"
+CLASS(XonoticMusicPlayerTab, XonoticTab)

        METHOD(XonoticMusicPlayerTab, fill, void(entity))
        METHOD(XonoticMusicPlayerTab, fill, void(entity))

-       ATTRIB(XonoticMusicPlayerTab, title, string, _("Music"))

        ATTRIB(XonoticMusicPlayerTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMusicPlayerTab, rows, float, 21)
        ATTRIB(XonoticMusicPlayerTab, columns, float, 6.5)
        ATTRIB(XonoticMusicPlayerTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMusicPlayerTab, rows, float, 21)
        ATTRIB(XonoticMusicPlayerTab, columns, float, 6.5)


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

-       me = spawnXonoticMusicPlayerTab();
+       me = NEW(XonoticMusicPlayerTab);

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