From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 18 Feb 2012 16:51:41 +0000 (+0100)
Subject: stop using pmove_vel with csqcplayers here
X-Git-Tag: xonotic-v0.6.0~69
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=42100a73a8b707fe89ad34a17e9dbf9730886464;p=xonotic%2Fxonotic-data.pk3dir.git

stop using pmove_vel with csqcplayers here
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 4b67215c6..c23c2c78f 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -94,6 +94,7 @@ vector GetCurrentFov(float fov)
 {
 	float zoomsensitivity, zoomspeed, zoomfactor, zoomdir;
 	float velocityzoom, curspeed;
+	vector v;
 
 	zoomsensitivity = autocvar_cl_zoomsensitivity;
 	zoomfactor = autocvar_cl_zoomfactor;
@@ -161,11 +162,15 @@ vector GetCurrentFov(float fov)
 
 	if(autocvar_cl_velocityzoom && autocvar_cl_velocityzoom_type) // _type = 0 disables velocity zoom too
 	{
+		v = pmove_vel;
+		if(csqcplayer)
+			v = csqcplayer.velocity;
+
 		switch(autocvar_cl_velocityzoom_type)
 		{
-			case 3: curspeed = max(0, v_forward * pmove_vel); break;
-			case 2: curspeed = (v_forward * pmove_vel); break;
-			case 1: default: curspeed = vlen(pmove_vel); break;
+			case 3: curspeed = max(0, v_forward * v); break;
+			case 2: curspeed = (v_forward * v); break;
+			case 1: default: curspeed = vlen(v); break;
 		}
 		
 		velocityzoom = bound(0, drawframetime / max(0.000000001, autocvar_cl_velocityzoom_time), 1); // speed at which the zoom adapts to player velocity