]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix vortex trying to zoom while switching weapons
authorMario <zacjardine@y7mail.com>
Sat, 29 Aug 2015 14:11:07 +0000 (00:11 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 29 Aug 2015 14:11:07 +0000 (00:11 +1000)
qcsrc/client/view.qc

index 7cf7af5f7e4502491e48bab6ee8915067b0f9f52..fb8b5ee7f8ec856dda18ff8aad4d112f00b27416 100644 (file)
@@ -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())