From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 28 Feb 2011 23:14:53 +0000 (+0200)
Subject: Colorize by health in the menu, and enabled by default
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=6f1981e2d7a1d842a65feae8524e1668f94e02a9

Colorize by health in the menu, and enabled by default
---

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index e62d34e6..0d67f416 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -109,7 +109,7 @@ _cl_playermodel models/player/vixen.zym
 _cl_playerskin 0
 crosshair 1
 seta crosshair_pickup 1 "crosshair grows then shrinks back when picking up an item"
-seta crosshair_color_by_health 0 "if enabled, crosshair color will depend on current health"
+seta crosshair_color_by_health 1 "if enabled, crosshair color will depend on current health"
 seta crosshair_pickup_speed 4 "speed of the crosshair pickup effect"
 seta crosshair_ring_alpha 0.5 "alpha of the crosshair ammo ring"
 seta crosshair_ring_size 3 "size of the crosshair ammo ring"
diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index 61f016ea..540cb596 100644
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
@@ -6,7 +6,7 @@ CLASS(VoretWeaponsDialog) EXTENDS(VoretDialog)
 	ATTRIB(VoretWeaponsDialog, title, string, "Weapon & Crosshair settings")
 	ATTRIB(VoretWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)
 	ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.5)
-	ATTRIB(VoretWeaponsDialog, rows, float, 18)
+	ATTRIB(VoretWeaponsDialog, rows, float, 19)
 	ATTRIB(VoretWeaponsDialog, columns, float, 4)
 	ATTRIB(VoretWeaponsDialog, weaponsList, entity, NULL)
 ENDCLASS(VoretWeaponsDialog)
@@ -73,14 +73,20 @@ void fillVoretWeaponsDialog(entity me)
 		me.TDempty(me, 0.3);
 		me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Red:"));
 		me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_red"));
+		setDependent(e, "crosshair_color_by_health", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.3);
 		me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Green:"));
 		me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_green"));
+		setDependent(e, "crosshair_color_by_health", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.3);
 		me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Blue:"));
 		me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_blue"));
+		setDependent(e, "crosshair_color_by_health", 0, 0);
+	me.TR(me);
+		me.TDempty(me, 0.3);
+		me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_color_by_health", "Colorize by health"));
 	me.TR(me);
 	me.TR(me);
 		me.TDempty(me, 0.3);