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

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qc b/qcsrc/menu/xonotic/dialog_settings_misc.qc
index 2ea9c1e9c263418960a277dbd04563f0fb351501..79e196170669f430519c20fe627d15c8d85fa4c9 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_misc.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.qc
@@ -1,7 +1,8 @@
-#ifdef INTERFACE
-CLASS(XonoticMiscSettingsTab) EXTENDS(XonoticTab)
+#ifndef DIALOG_SETTINGS_MISC_H
+#define DIALOG_SETTINGS_MISC_H
+#include "tab.qc"
+CLASS(XonoticMiscSettingsTab, XonoticTab)

        METHOD(XonoticMiscSettingsTab, fill, void(entity))
        METHOD(XonoticMiscSettingsTab, fill, void(entity))

-       ATTRIB(XonoticMiscSettingsTab, title, string, _("Misc"))

        ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMiscSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2)
        ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMiscSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2)


@@ -13,7 +14,7 @@ entity makeXonoticMiscSettingsTab();
 entity makeXonoticMiscSettingsTab()
 {
        entity me;
 entity makeXonoticMiscSettingsTab()
 {
        entity me;

-       me = spawnXonoticMiscSettingsTab();
+       me = NEW(XonoticMiscSettingsTab);

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