From: MirceaKitsune Date: Tue, 1 Mar 2011 00:08:30 +0000 (+0200) Subject: Dim crosshair color and / or alpha when unarmed X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=de72a875bd17483d2c7a36140e3c6fbedf27f81a Dim crosshair color and / or alpha when unarmed --- diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index 4ac9a73b..f563b383 100644 --- a/data/defaultVoretournament.cfg +++ b/data/defaultVoretournament.cfg @@ -110,6 +110,8 @@ _cl_playerskin 0 crosshair 11 seta crosshair_pickup 1 "crosshair grows then shrinks back when picking up an item" seta crosshair_color_by_health 1 "if enabled, crosshair color will depend on current health" +seta crosshair_unarmed_dim_color 0.5 "dim crosshair color by this amount when we aren't holding a weapon" +seta crosshair_unarmed_dim_alpha 0.5 "dim crosshair alpha by this amount when we aren't holding a weapon" seta crosshair_pickup_speed 4 "speed of the crosshair pickup effect" seta crosshair_ring_alpha 0.5 "alpha of the crosshair ammo ring" seta crosshair_ring_size 3 "size of the crosshair ammo ring" diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 674fb9c0..73aaf13a 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -1051,6 +1051,15 @@ void CSQC_UpdateView(float w, float h) wcross_alpha = cvar("crosshair_color_alpha"); wcross_resolution = cvar("crosshair_size"); + if(!activeweapon) + if(!swallow_indicator) + { + if(cvar("crosshair_unarmed_dim_color")) + wcross_color *= cvar("crosshair_unarmed_dim_color"); + if(cvar("crosshair_unarmed_dim_alpha")) + wcross_alpha *= cvar("crosshair_unarmed_dim_alpha"); + } + wcross_name = strcat("gfx/crosshair", wcross_style); if(cvar("crosshair_effect_scalefade"))