From: FruitieX <fruitiex@gmail.com>
Date: Sat, 27 Nov 2010 20:07:35 +0000 (+0200)
Subject: allow a custom color on the crosshair dot
X-Git-Tag: xonotic-v0.1.0preview~94^2~2^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=37160302199694c0be69f15cb454af93e2edb4bf

allow a custom color on the crosshair dot
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 25e3209cd3..9f6359a321 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -96,6 +96,7 @@ seta crosshair_size 0.35
 seta crosshair_dot 1
 seta crosshair_dot_alpha 1
 seta crosshair_dot_size 1
+seta crosshair_dot_color 0 "when != 0, use custom color for the crosshair dot"
 seta crosshair_pickup 0.25
 seta crosshair_pickup_speed 4
 seta crosshair_per_weapon 0	"when 1, each gun will display a different crosshair"
diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 65f36cf7a0..a3fa9c2162 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -1001,7 +1001,14 @@ void CSQC_UpdateView(float w, float h)
 			CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f);
 
 			if(cvar("crosshair_dot"))
+            {
+                vector wcross_color_old;
+                wcross_color_old = wcross_color;
+                if(cvar_string("crosshair_dot_color") != "0")
+                    wcross_color = stov(cvar_string("crosshair_dot_color"));
 				CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", wcross_alpha * f * cvar("crosshair_dot_alpha"));
+                wcross_color = wcross_color_old;
+            }
 
 			wcross_name_alpha_goal_prev = f;
 		}