Add color for swallow indicator

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index df15ab56df7fb69f33d2cc7383eb74d9ea2e7240..1a5932d26a251d73b3919483255411fe0111acf3 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -114,6 +114,9 @@ seta crosshair_ring_alpha 0.5
 seta crosshair_ring_size 3\r
 seta crosshair_swallowindicator 1\r
 seta crosshair_swallowindicator_size 4\r
+seta crosshair_swallowindicator_color_red 1\r
+seta crosshair_swallowindicator_color_green 1\r
+seta crosshair_swallowindicator_color_blue 1\r
 seta crosshair_effect_speed 0.25 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time"\r
 seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects"\r
 seta crosshair_hittest 1.25 "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"\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 1daa4cb4bde22f8d8ed81e8aefb85ef8b0612b16..8ff9fbd41d37ba347e516cf703ebdecbcd1a9cfd 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -948,9 +948,18 @@ void CSQC_UpdateView(float w, float h)
                                string wcross_name;\r
                                float wcross_alpha, wcross_scale, wcross_blur, wcross_resolution;\r
 \r
-                               wcross_color_x = cvar("crosshair_color_red");\r
-                               wcross_color_y = cvar("crosshair_color_green");\r
-                               wcross_color_z = cvar("crosshair_color_blue");\r
+                               if(swallow_indicator)\r
+                               {\r
+                                       wcross_color_x = cvar("crosshair_swallowindicator_color_red");\r
+                                       wcross_color_y = cvar("crosshair_swallowindicator_color_green");\r
+                                       wcross_color_z = cvar("crosshair_swallowindicator_color_blue");\r
+                               }\r
+                               else\r
+                               {\r
+                                       wcross_color_x = cvar("crosshair_color_red");\r
+                                       wcross_color_y = cvar("crosshair_color_green");\r
+                                       wcross_color_z = cvar("crosshair_color_blue");\r
+                               }\r
                                wcross_alpha = cvar("crosshair_color_alpha");\r
                                wcross_resolution = cvar("crosshair_size");\r
 \r