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

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

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
index 86e1624a81175472570c90feb6a6ef3147f5bd63..a4e480e18ab4197e5f0fdd52b0ac27fcab1a1e8d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
@@ -1,5 +1,7 @@
-#ifdef INTERFACE
-CLASS(XonoticServerListTab) EXTENDS(XonoticTab)
+#ifndef DIALOG_MULTIPLAYER_JOIN_H
+#define DIALOG_MULTIPLAYER_JOIN_H
+#include "tab.qc"
+CLASS(XonoticServerListTab, XonoticTab)

        METHOD(XonoticServerListTab, fill, void(entity))
        ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticServerListTab, rows, float, 23)
        METHOD(XonoticServerListTab, fill, void(entity))
        ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticServerListTab, rows, float, 23)


@@ -13,7 +15,7 @@ entity makeXonoticServerListTab();
 entity makeXonoticServerListTab()
 {
        entity me;
 entity makeXonoticServerListTab()
 {
        entity me;

-       me = spawnXonoticServerListTab();
+       me = NEW(XonoticServerListTab);

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