From: Samual Lenks Date: Fri, 8 Feb 2013 01:42:44 +0000 (-0500) Subject: Cvar updates X-Git-Tag: xonotic-v0.7.0~100^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6681a8ee64779ec70b48f6e54f880ea9ec359789;p=xonotic%2Fxonotic-data.pk3dir.git Cvar updates --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index ef666e2da..fc847e3aa 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -62,6 +62,9 @@ seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out" seta cl_velocityzoom_type 3 "how to factor in speed, 1 = all velocity in all directions, 2 = velocity only in forward direction (can be negative), 3 = velocity only in forward direction (limited to forward only)" seta cl_velocityzoom_speed 1000 "target speed for fov factoring" seta cl_velocityzoom_time 0.2 "time value for averaging speed values" +seta cl_spawnzoom 1 "zoom effect immediately when a player spawns" +seta cl_spawnzoom_speed 1 "speed at which zooming occurs while spawning" +seta cl_spawnzoom_factor 2 "factor of zoom while spawning" seta cl_zoomfactor 5 "how much +zoom will zoom (1-16)" seta cl_zoomspeed 8 "how fast it will zoom (0.5-16), negative values mean instant zoom" seta cl_zoomsensitivity 0 "how zoom changes sensitivity (0 = weakest, 1 = strongest)" diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index f023ab23a..8206c1f3a 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -129,7 +129,7 @@ vector GetCurrentFov(float fov) { current_viewzoom = min(1, current_viewzoom + drawframetime); } - else if(zoomin_effect) + else if(autocvar_cl_spawnzoom && zoomin_effect) { float spawnzoomfactor = bound(1, autocvar_cl_spawnzoom_factor, 16); diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 779815ad4..49506aefb 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -63,7 +63,8 @@ var float autocvar_cl_reticle = 1; float autocvar_cl_reticle_item_nex; float autocvar_cl_reticle_item_normal; float autocvar_cl_reticle_stretch; -var float autocvar_cl_spawnzoom_speed = 2; +var float autocvar_cl_spawnzoom = 1; +var float autocvar_cl_spawnzoom_speed = 1; var float autocvar_cl_spawnzoom_factor = 2; float autocvar_cl_stripcolorcodes; var float autocvar_cl_vehicle_spiderbot_cross_alpha = 0.6;