From: Akari <hetors.email@gmail.com>
Date: Mon, 10 Jan 2011 09:55:42 +0000 (+0200)
Subject: added a "color by health" checkbox to the menu
X-Git-Tag: xonotic-v0.5.0~311^2~32^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=20edf158c08c77222446b9d3065c79e1159e9714;p=xonotic%2Fxonotic-data.pk3dir.git

added a "color by health" checkbox to the menu
---

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 9365544e9..3d7fecc4f 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -135,11 +135,15 @@ void XonoticPlayerSettingsTab_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair color:"));
-		me.TD(me, 2, 1.8, e = makeXonoticColorpickerString("crosshair_color", "crosshair_color"));
+		me.TD(me, 1, 2/3, e = makeXonoticCheckBox(0, "crosshair_color_per_weapon", "Per weapon"));
+		me.TDempty(me, 0.1);
+		me.TD(me, 1, 2/3, e = makeXonoticCheckBox(0, "crosshair_color_by_health", "By health"));
 		setDependent(e, "crosshair_color_per_weapon", 0, 0);
 	me.TR(me);
-		me.TDempty(me, 0.3);
-		me.TD(me, 1, 0.7, e = makeXonoticCheckBox(0, "crosshair_color_per_weapon", "Per weapon"));
+		me.TDempty(me, 0.5);
+		me.TD(me, 2, 1.8, e = makeXonoticColorpickerString("crosshair_color", "crosshair_color"));
+		setDependentAND(e, "crosshair_color_per_weapon", 0, 0, "crosshair_color_by_health", 0, 0);
+	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "crosshair_dot", "Enable center dot"));
 	me.TR(me);