Colorize by health in the menu, and enabled by default

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index e62d34e6110842ffd4b2435276b76d555b152436..0d67f4163d61107ac4a83e7c8de6a0846553333b 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -109,7 +109,7 @@ _cl_playermodel models/player/vixen.zym
 _cl_playerskin 0\r
 crosshair 1\r
 seta crosshair_pickup 1 "crosshair grows then shrinks back when picking up an item"\r
 _cl_playerskin 0\r
 crosshair 1\r
 seta crosshair_pickup 1 "crosshair grows then shrinks back when picking up an item"\r

-seta crosshair_color_by_health 0 "if enabled, crosshair color will depend on current health"\r
+seta crosshair_color_by_health 1 "if enabled, crosshair color will depend on current health"\r

 seta crosshair_pickup_speed 4 "speed of the crosshair pickup effect"\r
 seta crosshair_ring_alpha 0.5 "alpha of the crosshair ammo ring"\r
 seta crosshair_ring_size 3 "size of the crosshair ammo ring"\r
 seta crosshair_pickup_speed 4 "speed of the crosshair pickup effect"\r
 seta crosshair_ring_alpha 0.5 "alpha of the crosshair ammo ring"\r
 seta crosshair_ring_size 3 "size of the crosshair ammo ring"\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index 61f016ea6676fe0602635ff44eb6ba7753b3ebc6..540cb596e4507011d8ce45d208ab924ed4b75d12 100644 (file)
--- 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")\r
        ATTRIB(VoretWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)\r
        ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.5)\r
        ATTRIB(VoretWeaponsDialog, title, string, "Weapon & Crosshair settings")\r
        ATTRIB(VoretWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)\r
        ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.5)\r

-       ATTRIB(VoretWeaponsDialog, rows, float, 18)\r
+       ATTRIB(VoretWeaponsDialog, rows, float, 19)\r

        ATTRIB(VoretWeaponsDialog, columns, float, 4)\r
        ATTRIB(VoretWeaponsDialog, weaponsList, entity, NULL)\r
 ENDCLASS(VoretWeaponsDialog)\r
        ATTRIB(VoretWeaponsDialog, columns, float, 4)\r
        ATTRIB(VoretWeaponsDialog, weaponsList, entity, NULL)\r
 ENDCLASS(VoretWeaponsDialog)\r


@@ -73,14 +73,20 @@ void fillVoretWeaponsDialog(entity me)
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Red:"));\r
                me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_red"));\r
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Red:"));\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, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_green"));\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, 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, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_blue"));\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, 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
+               me.TDempty(me, 0.3);\r
+               me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_color_by_health", "Colorize by health"));\r

        me.TR(me);\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
        me.TR(me);\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r