From 42100a73a8b707fe89ad34a17e9dbf9730886464 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 18 Feb 2012 17:51:41 +0100 Subject: [PATCH] stop using pmove_vel with csqcplayers here --- qcsrc/client/View.qc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 -- 2.39.2