From 0c6af58c201bd97b85e16cf40087187c75d3322f Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 9 Mar 2021 18:49:02 +0100 Subject: [PATCH] Add a warning to fix #1912 "Team choice bound to model color creates gameplay issues" --- qcsrc/menu/xonotic/dialog_settings_game_model.qc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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:"))); -- 2.39.2