Merge remote-tracking branch 'origin/master' into samual/fix_deathfade

[xonotic/xonotic-data.pk3dir.git] / crosshairs.cfg

diff --git a/crosshairs.cfg b/crosshairs.cfg
index e37584bdf5c194c0229765edf283dbf4b787370e..e02e7c2e2ebe50949338d03c0794e6187a174813 100644 (file)
--- a/crosshairs.cfg
+++ b/crosshairs.cfg
@@ -17,7 +17,7 @@ seta crosshair_dot_color "1 0 0"
 seta crosshair_dot_color_custom 1 "use a custom color for the crosshair dot"
 
 // smooth transitions for crosshair changes
-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_time 0.4 "how fast (in seconds) some crosshair effects should take place, 0 = instant"
 seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects"
 
 // item pickup animation settings