From be0d26e18edec74aa7abbdc34ab84c451efac417 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Mon, 28 Feb 2011 22:45:49 +0200 Subject: [PATCH] Add color for swallow indicator --- data/defaultVoretournament.cfg | 3 +++ data/qcsrc/client/View.qc | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index df15ab56..1a5932d2 100644 --- a/data/defaultVoretournament.cfg +++ b/data/defaultVoretournament.cfg @@ -114,6 +114,9 @@ seta crosshair_ring_alpha 0.5 seta crosshair_ring_size 3 seta crosshair_swallowindicator 1 seta crosshair_swallowindicator_size 4 +seta crosshair_swallowindicator_color_red 1 +seta crosshair_swallowindicator_color_green 1 +seta crosshair_swallowindicator_color_blue 1 seta crosshair_effect_speed 0.25 "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.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" diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 1daa4cb4..8ff9fbd4 100644 --- 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; float wcross_alpha, wcross_scale, wcross_blur, wcross_resolution; - wcross_color_x = cvar("crosshair_color_red"); - wcross_color_y = cvar("crosshair_color_green"); - wcross_color_z = cvar("crosshair_color_blue"); + if(swallow_indicator) + { + wcross_color_x = cvar("crosshair_swallowindicator_color_red"); + wcross_color_y = cvar("crosshair_swallowindicator_color_green"); + wcross_color_z = cvar("crosshair_swallowindicator_color_blue"); + } + else + { + wcross_color_x = cvar("crosshair_color_red"); + wcross_color_y = cvar("crosshair_color_green"); + wcross_color_z = cvar("crosshair_color_blue"); + } wcross_alpha = cvar("crosshair_color_alpha"); wcross_resolution = cvar("crosshair_size"); -- 2.39.2