From: otta8634 <k9wolf@pm.me>
Date: Sat, 8 Feb 2025 18:09:08 +0000 (+0800)
Subject: Split up the menu cl_gentle checkbox
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=305d9b414667ec2a8196c698d78e1f6592875c9e;p=xonotic%2Fxonotic-data.pk3dir.git

Split up the menu cl_gentle checkbox

Now gore effects can be enabled with harsh language disabled, or vice versa, via the menu.
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_user.qc b/qcsrc/menu/xonotic/dialog_settings_user.qc
index 70f3f80a8..bbe0d1434 100644
--- a/qcsrc/menu/xonotic/dialog_settings_user.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_user.qc
@@ -68,8 +68,17 @@ void XonoticUserSettingsTab_fill(entity me)
 			e.onClick = SetLanguage_Click;
 			e.onClickEntity = sk;
 
-	me.gotoRC(me, 11.5, 3.25); me.setFirstColumn(me, me.currentColumn);
+	me.gotoRC(me, 11, 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")));
 			e.sendCvars = true;
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.3, e = makeXonoticCheckBox(0, "cl_gentle_gibs", _("Just the gore")));
+			makeMulti(e, "cl_gentle_damage");
+			setDependent(e, "cl_gentle", 0, 0);
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.3, e = makeXonoticCheckBox(0, "cl_gentle_messages", _("Just the language")));
+			setDependent(e, "cl_gentle", 0, 0);
 }