r4223 - in trunk/data: . qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-28 09:41:54 -0400 (Thu, 28 Aug 2008)
New Revision: 4223

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/client/View.qc
   trunk/data/qcsrc/client/csqc_builtins.qc
Log:
new cvar: cl_zoomsensitivity


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-08-28 13:26:19 UTC (rev 4222)
+++ trunk/data/defaultNexuiz.cfg	2008-08-28 13:41:54 UTC (rev 4223)
@@ -80,6 +80,7 @@
 fov 90
 seta cl_zoomfactor 5  // how much +zoom will zoom (1-16)
 seta cl_zoomspeed 3.5 // how fast it will zoom (0.5-16), negative values mean instant zoom
+seta cl_zoomsensitivity 1 // how much sensitivity is influenced by zoom (0 to 1)
 freelook 1
 sensitivity 6
 v_gamma 1.125000

Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2008-08-28 13:26:19 UTC (rev 4222)
+++ trunk/data/qcsrc/client/View.qc	2008-08-28 13:41:54 UTC (rev 4223)
@@ -16,8 +16,9 @@
 
 vector GetCurrentFov()
 {
-	float zoomspeed, zoomfactor, zoomdir;
+	float zoomsensitivity, zoomspeed, zoomfactor, zoomdir;
 
+	zoomsensitivity = cvar("cl_zoomsensitivity");
 	zoomfactor = cvar("cl_zoomfactor");
 	if(zoomfactor < 1 || zoomfactor > 16)
 		zoomfactor = 2.5;
@@ -55,6 +56,11 @@
 		}
 	}
 
+	if(zoomsensitivity > 0)
+		setsensitivityscale(pow(current_viewzoom, zoomsensitivity));
+	else
+		setsensitivityscale(1);
+
 	float frustumx, frustumy, fovx, fovy;
 	frustumy = tan(cvar("fov") * 0.00872664625997164788) * 0.75 * current_viewzoom;
 	frustumx = frustumy * cvar("vid_width") / cvar("vid_height") / cvar("vid_pixelheight");

Modified: trunk/data/qcsrc/client/csqc_builtins.qc
===================================================================
--- trunk/data/qcsrc/client/csqc_builtins.qc	2008-08-28 13:26:19 UTC (rev 4222)
+++ trunk/data/qcsrc/client/csqc_builtins.qc	2008-08-28 13:41:54 UTC (rev 4223)
@@ -115,7 +115,7 @@
 void (string s, ...)							cprint = #338;
 void (string s, ...)							print = #339;
 
-void (float scale)							setsensitivityscale = #347;
+void (float scale)							setsensitivityscale = #346;
 
 
 void (float framenum)							RetrieveMovementFrame = #345;