]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Don't allow zooming with secondary attack while spectating/observing
authorMario <mario@smbclan.net>
Tue, 12 Jul 2016 12:54:30 +0000 (22:54 +1000)
committerMario <mario@smbclan.net>
Tue, 12 Jul 2016 12:54:30 +0000 (22:54 +1000)
qcsrc/client/view.qc

index af7eb35b338418556d0ceda77c9690910ff85352..4ca30d4a8de656478a7bc75ebf54ee4b33c9b73b 100644 (file)
@@ -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;