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 d1a4da31a0f8f9b2c2b69b86d2173f9454f7f7f7..6f0374fb9f94ed26b506c7ecb0ad5a9d3e40bb98 100644 (file)
--- 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)\r
        ATTRIB(Label, align, float, 0.5)\r
        ATTRIB(Label, allowCut, float, 0)\r
-       ATTRIB(Label, allowColors, float, 0)\r
+       ATTRIB(Label, allowColors, float, 1)\r
        ATTRIB(Label, keepspaceLeft, float, 0) // for use by subclasses (radiobuttons for example)\r
        ATTRIB(Label, keepspaceRight, float, 0)\r
        ATTRIB(Label, marginLeft, float, 0) // alternate way to specify keepspace* (in characters from the font)\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
index 1fc6259c1ca26835af784e3240e7dac5db1dd7ca..8f17ff5c737badcf282942022833750561a11539 100644 (file)
--- 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);\r
                me.TR(me);\r
                        me.TDempty(me, 0.2);\r
-                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default red:"));\r
+                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default ^1red^7:"));\r
                        me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_r"));\r
                                setDependent(e, "viewsize", 0, 100);\r
                me.TR(me);\r
                        me.TDempty(me, 0.2);\r
-                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default green:"));\r
+                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default ^2green^7:"));\r
                        me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_g"));\r
                                setDependent(e, "viewsize", 0, 100);\r
                me.TR(me);\r
                        me.TDempty(me, 0.2);\r
-                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default blue:"));\r
+                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default ^4blue^7:"));\r
                        me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_b"));\r
                                setDependent(e, "viewsize", 0, 100);\r
                me.TR(me);\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index d2de6d4f60a1e4bcb668cf5a316332b145b7207c..c25086211e27d2db0a53a675cad6bfeb7e44c878 100644 (file)
--- 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"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
-               me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Red:"));\r
+               me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair ^1Red^7:"));\r
+               setDependent(e, "crosshair_color_by_health", 0, 0);\r
                me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_red"));\r
                setDependent(e, "crosshair_color_by_health", 0, 0);\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
-               me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Green:"));\r
+               me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair ^2Green^7:"));\r
+               setDependent(e, "crosshair_color_by_health", 0, 0);\r
                me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_green"));\r
                setDependent(e, "crosshair_color_by_health", 0, 0);\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
-               me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Blue:"));\r
+               me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair ^4Blue^7:"));\r
+               setDependent(e, "crosshair_color_by_health", 0, 0);\r
                me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_blue"));\r
                setDependent(e, "crosshair_color_by_health", 0, 0);\r
        me.TR(me);\r
@@ -103,13 +106,13 @@ void fillVoretWeaponsDialog(entity me)
                makeMulti(sl, "crosshair_unarmed_dim_alpha");\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_pickup", "Crosshair pickup effect"));\r
+               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_pickup", "Pickup effect"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_ring_alpha", "Crosshair ammo ring"));\r
+               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_ring_alpha", "Ammo ring"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_swallowindicator", "Crosshair swallow indicator"));\r
+               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_swallowindicator", "Swallow indicator"));\r
        me.TR(me);\r
        me.TR(me);\r
        me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon model settings:"));\r