merge terencehill's crosshair branch into fruitiex/panelhud even if it's slightly...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8af70b4776968f8b493729d7ff810ee8400c1d84..50c092c525fff5d09c88f40221878b83562aeb8b 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -100,6 +100,7 @@ seta crosshair_pickup 0.25
 seta crosshair_pickup_speed 4
 seta crosshair_per_weapon 0    "when 1, each gun will display a different crosshair"
 seta crosshair_color_override 0        "when 1, crosshair_color_* overrides the per-weapon color"
+seta crosshair_color_per_weapon 1 "when 1, each gun will display a different colored crosshair"
 seta crosshair_effect_speed -1 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time"
 seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects"
 seta crosshair_hittest 1 "do a crosshair hit evaluation; also, the crosshair is scaled by the given number when aiming at an enemy, and blurred when aiming at a team mate"

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 1ca40d6b69de8d4ef7dca0da1ec82791df92e1b3..4f51f957a3f3838aa69674190ae034e8e0189168 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -134,8 +134,8 @@ 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"));
-               setDependent(e, "crosshair_color_per_weapon", 1, 1);
+               me.TD(me, 2, 1.8, e = makeXonoticColorpickerString("crosshair_color", "crosshair_color"));
+               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"));