From: FruitieX <fruitiex@gmail.com>
Date: Fri, 12 Nov 2010 06:54:46 +0000 (+0200)
Subject: merge terencehill's crosshair branch into fruitiex/panelhud even if it's slightly... 
X-Git-Tag: xonotic-v0.1.0preview~134^2~2
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=c7ba32c43f0c0eb2e34732c0f82fa84ce89bc916;p=xonotic%2Fxonotic-data.pk3dir.git

merge terencehill's crosshair branch into fruitiex/panelhud even if it's slightly unrelated... This is so I could make the colorpicker compatible with the changes in fruitiex/panelhud. Also, terencehill must have forgot a cvar from defaultXonotic.cfg, and setDependent was inverted.
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8af70b477..50c092c52 100644
--- 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 1ca40d6b6..4f51f957a 100644
--- 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"));