From: terencehill <piuntn@gmail.com>
Date: Tue, 9 Mar 2021 17:49:02 +0000 (+0100)
Subject: Add a warning to fix #1912 "Team choice bound to model color creates gameplay issues"
X-Git-Tag: xonotic-v0.8.5~517
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c6af58c201bd97b85e16cf40087187c75d3322f;p=xonotic%2Fxonotic-data.pk3dir.git

Add a warning to fix #1912 "Team choice bound to model color creates gameplay issues"
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qc b/qcsrc/menu/xonotic/dialog_settings_game_model.qc
index 822e2c32d..bd60d490f 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_model.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qc
@@ -51,11 +51,12 @@ void XonoticGameModelSettingsTab_fill(entity me)
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayermodels", _("Force player models to mine")));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Force player colors to mine")));
-		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_forceplayercolors"));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider_T("cl_forceplayercolors",
+			_("Warning: selecting 'Always' your team's color may be the same as the enemy team")));
 			e.addValue(e, _("Never"), "0");
-			e.addValue(e, _("In non teamplay modes only"), "1");
-			e.addValue(e, _("Always"), "2");
+			e.addValue(e, _("Except in team games"), "1");
 			e.addValue(e, _("Only in Duel"), "3");
+			e.addValue(e, _("Always"), "2");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Body fading:")));