From: Samual Lenks <samual@xonotic.org>
Date: Fri, 8 Feb 2013 01:03:10 +0000 (-0500)
Subject: Stuff and things
X-Git-Tag: xonotic-v0.7.0~100^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5aae7a28cdd8c9f26d3602c8db6d76b61ed56d95;p=xonotic%2Fxonotic-data.pk3dir.git

Stuff and things
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 117de38c4..f023ab23a 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -107,10 +107,6 @@ vector GetCurrentFov(float fov)
 	if(zoomspeed < 0.5 || zoomspeed > 16)
 			zoomspeed = 3.5;
 
-
-	float spawnzoomfactor = bound(1, autocvar_cl_spawnzoom_factor, 16);
-	float spawnzoomspeed = autocvar_cl_spawnzoom_speed;
-
 	zoomdir = button_zoom;
 	if(hud == HUD_NORMAL)
 	if((activeweapon == WEP_NEX && nex_scope) || (activeweapon == WEP_RIFLE && rifle_scope)) // do NOT use switchweapon here
@@ -135,10 +131,9 @@ vector GetCurrentFov(float fov)
 	}
 	else if(zoomin_effect)
 	{
-		/*if(autocvar_cl_spawnzoom_type == 1) { current_viewzoom = (current_viewzoom + drawframetime * spawnzoomspeed * (1 - 1 / spawnzoomfactor)); }
-		else 								{ */
+		float spawnzoomfactor = bound(1, autocvar_cl_spawnzoom_factor, 16);
 		
-		current_viewzoom += (spawnzoomspeed * (spawnzoomfactor - current_viewzoom) * drawframetime); 
+		current_viewzoom += (autocvar_cl_spawnzoom_speed * (spawnzoomfactor - current_viewzoom) * drawframetime); 
 		current_viewzoom = bound(1 / spawnzoomfactor, current_viewzoom, 1);
 		if(current_viewzoom == 1) { zoomin_effect = 0; }
 	}