From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 12 Jul 2011 21:50:46 +0000 (+0300)
Subject: Enable and use colors in some menu labels
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e30f1e21909864596a6d166f7f17bd39a59677f0;p=voretournament%2Fvoretournament.git

Enable and use colors in some menu labels
---

diff --git a/data/qcsrc/menu/item/label.c b/data/qcsrc/menu/item/label.c
index d1a4da31..6f0374fb 100644
--- a/data/qcsrc/menu/item/label.c
+++ b/data/qcsrc/menu/item/label.c
@@ -9,7 +9,7 @@ CLASS(Label) EXTENDS(Item)
 	ATTRIB(Label, fontSize, float, 8)
 	ATTRIB(Label, align, float, 0.5)
 	ATTRIB(Label, allowCut, float, 0)
-	ATTRIB(Label, allowColors, float, 0)
+	ATTRIB(Label, allowColors, float, 1)
 	ATTRIB(Label, keepspaceLeft, float, 0) // for use by subclasses (radiobuttons for example)
 	ATTRIB(Label, keepspaceRight, float, 0)
 	ATTRIB(Label, marginLeft, float, 0) // alternate way to specify keepspace* (in characters from the font)
diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
index 1fc6259c..8f17ff5c 100644
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
@@ -58,17 +58,17 @@ void fillVoretHudDialog(entity me)
 			setDependent(e, "viewsize", 0, 100);
 		me.TR(me);
 			me.TDempty(me, 0.2);
-			me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default red:"));
+			me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default ^1red^7:"));
 			me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_r"));
 				setDependent(e, "viewsize", 0, 100);
 		me.TR(me);
 			me.TDempty(me, 0.2);
-			me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default green:"));
+			me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default ^2green^7:"));
 			me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_g"));
 				setDependent(e, "viewsize", 0, 100);
 		me.TR(me);
 			me.TDempty(me, 0.2);
-			me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default blue:"));
+			me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default ^4blue^7:"));
 			me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_b"));
 				setDependent(e, "viewsize", 0, 100);
 		me.TR(me);
diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index d2de6d4f..c2508621 100644
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
@@ -71,17 +71,20 @@ void fillVoretWeaponsDialog(entity me)
 		me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_alpha"));
 	me.TR(me);
 		me.TDempty(me, 0.3);
-		me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Red:"));
+		me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair ^1Red^7:"));
+		setDependent(e, "crosshair_color_by_health", 0, 0);
 		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, 1.25, e = makeVoretTextLabel(0, "Crosshair ^2Green^7:"));
+		setDependent(e, "crosshair_color_by_health", 0, 0);
 		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, 1.25, e = makeVoretTextLabel(0, "Crosshair ^4Blue^7:"));
+		setDependent(e, "crosshair_color_by_health", 0, 0);
 		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);
@@ -103,13 +106,13 @@ void fillVoretWeaponsDialog(entity me)
 		makeMulti(sl, "crosshair_unarmed_dim_alpha");
 	me.TR(me);
 		me.TDempty(me, 0.3);
-		me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_pickup", "Crosshair pickup effect"));
+		me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_pickup", "Pickup effect"));
 	me.TR(me);
 		me.TDempty(me, 0.3);
-		me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_ring_alpha", "Crosshair ammo ring"));
+		me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_ring_alpha", "Ammo ring"));
 	me.TR(me);
 		me.TDempty(me, 0.3);
-		me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_swallowindicator", "Crosshair swallow indicator"));
+		me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_swallowindicator", "Swallow indicator"));
 	me.TR(me);
 	me.TR(me);
 	me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon model settings:"));