Merge branch 'master' into Mario/weaponorder

[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 07ab1bd0d1d845a5fec09ecab657d4b328dc4cbd..5e5b707faed5fd4d216b23a1348693d7bc2e712d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_user.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_user.qc
@@ -1,16 +1,11 @@
-#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)
-ENDCLASS(XonoticUserSettingsTab)
-entity makeXonoticUserSettingsTab();
-#endif
+#include "dialog_settings_user.qh"
+
+#include "commandbutton.qh"
+#include "textlabel.qh"
+#include "languagelist.qh"
+#include "skinlist.qh"
+#include "checkbox.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticUserSettingsTab()
 {
        entity me;
@@ -22,8 +17,6 @@ entity makeXonoticUserSettingsTab()
 void XonoticUserSettingsTab_fill(entity me)
 {
        entity e, sk;
-       entity userApplyButton = makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "sendcvar cl_gentle;", COMMANDBUTTON_APPLY);
-       userApplyButton.disableOnClick = true;
 
        me.TR(me);
                me.TDempty(me, 0.25);
@@ -77,11 +70,6 @@ void XonoticUserSettingsTab_fill(entity me)
 
        me.gotoRC(me, 11.5, 3.25); me.setFirstColumn(me, me.currentColumn);
                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)")));
-                       e.applyButton = userApplyButton;
-
-       me.gotoRC(me, me.rows - 1, 0);
-               me.TD(me, 1, 6, userApplyButton);
-
+                       _("Replace blood and gibs with content that does not have any gore effects")));
+                       e.sendCvars = true;
 }
-#endif