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

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qc b/qcsrc/menu/xonotic/dialog_settings_video.qc
index 36929cbd716a669170fb8cd06903ba214e05a69b..61a93f62e2696c06ff047745363e45cbb69278db 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_video.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_video.qc
@@ -1,7 +1,8 @@
-#ifdef INTERFACE
-CLASS(XonoticVideoSettingsTab) EXTENDS(XonoticTab)
+#ifndef DIALOG_SETTINGS_VIDEO_H
+#define DIALOG_SETTINGS_VIDEO_H
+#include "tab.qc"
+CLASS(XonoticVideoSettingsTab, XonoticTab)

        METHOD(XonoticVideoSettingsTab, fill, void(entity))
        METHOD(XonoticVideoSettingsTab, fill, void(entity))

-       ATTRIB(XonoticVideoSettingsTab, title, string, _("Video"))

        ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticVideoSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2) // added extra .2 for center space
        ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticVideoSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2) // added extra .2 for center space


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

-       me = spawnXonoticVideoSettingsTab();
+       me = NEW(XonoticVideoSettingsTab);

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