From: Mario <zacjardine@y7mail.com>
Date: Sat, 29 Aug 2015 14:11:07 +0000 (+1000)
Subject: Fix vortex trying to zoom while switching weapons
X-Git-Tag: xonotic-v0.8.2~1991
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=43fd14270a0f27b2cdd0195f56b6ed4daaa036ef;p=xonotic%2Fxonotic-data.pk3dir.git

Fix vortex trying to zoom while switching weapons
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 7cf7af5f7..fb8b5ee7f 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -131,6 +131,7 @@ vector GetCurrentFov(float fov)
 
 	zoomdir = button_zoom;
 	if(hud == HUD_NORMAL)
+	if(switchweapon == activeweapon)
 	if((activeweapon == WEP_VORTEX.m_id && vortex_scope) || (activeweapon == WEP_RIFLE.m_id && rifle_scope)) // do NOT use switchweapon here
 		zoomdir += button_attack2;
 	if(spectatee_status > 0 || isdemo())