From: Mario <mario@smbclan.net>
Date: Tue, 12 Jul 2016 12:54:30 +0000 (+1000)
Subject: Don't allow zooming with secondary attack while spectating/observing
X-Git-Tag: xonotic-v0.8.2~700^2~80
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=92fd5c54e364ac2f8bac61889e9af7e95f77d327;p=xonotic%2Fxonotic-data.pk3dir.git

Don't allow zooming with secondary attack while spectating/observing
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index af7eb35b3..4ca30d4a8 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -447,7 +447,7 @@ vector GetCurrentFov(float fov)
 			zoomspeed = 3.5;
 
 	zoomdir = button_zoom;
-	if(hud == HUD_NORMAL)
+	if(hud == HUD_NORMAL && !spectatee_status)
 	if(switchweapon == activeweapon)
 	if((activeweapon == WEP_VORTEX && !WEP_CVAR(vortex, secondary)) || (activeweapon == WEP_RIFLE && !WEP_CVAR(rifle, secondary))) // do NOT use switchweapon here
 		zoomdir += button_attack2;