Merge branch 'terencehill/obsolete_cvars_removal' into 'master'

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_user.qc b/qcsrc/menu/xonotic/dialog_settings_user.qc
index 180efccb9bdd323ba86ef8cedc490175e46cd233..062d538bba6e7e322ac602c509110532ce8e9ee2 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_user.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_user.qc
@@ -1,7 +1,8 @@
-#ifdef INTERFACE
-CLASS(XonoticUserSettingsTab) EXTENDS(XonoticTab)
-       METHOD(XonoticUserSettingsTab, fill, void(entity))
-       ATTRIB(XonoticUserSettingsTab, title, string, _("User"))
+#ifndef DIALOG_SETTINGS_USER_H
+#define DIALOG_SETTINGS_USER_H
+#include "tab.qc"
+CLASS(XonoticUserSettingsTab, XonoticTab)
+       METHOD(XonoticUserSettingsTab, fill, void(entity));
        ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticUserSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticUserSettingsTab, columns, float, 6)
@@ -13,7 +14,7 @@ entity makeXonoticUserSettingsTab();
 entity makeXonoticUserSettingsTab()
 {
        entity me;
-       me = spawnXonoticUserSettingsTab();
+       me = NEW(XonoticUserSettingsTab);
        me.configureDialog(me);
        return me;
 }
@@ -74,7 +75,8 @@ void XonoticUserSettingsTab_fill(entity me)
                        e.onClickEntity = sk;
 
        me.gotoRC(me, 11.5, 3.25); me.setFirstColumn(me, me.currentColumn);
-               me.TD(me, 1, 2.5, e = makeXonoticCheckBox(0, "cl_gentle", _("Disable gore effects and harsh language")));
+               me.TD(me, 1, 2.5, e = makeXonoticCheckBox_T(0, "cl_gentle", _("Disable gore effects and harsh language"),
+                       _("Replace blood and gibs with content that does not have any gore effects (default: disabled)")));
 
        //me.TR(me);
        //      me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Menu tooltips:")));