If cl_lockview is enabled disable crosshair, spawn zoom effect and velocity zoom...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / main.qc

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index e4661468d8a8c050f44d19aea9973131b0023f6b..a049b98f2137ce3a772cbf12b3ab53ce1202c25a 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -754,8 +754,11 @@ NET_HANDLE(ENT_CLIENT_SPAWNEVENT, bool is_new)
        // local spawn actions
        if(is_new && (!entnum || (entnum == player_localentnum)))
        {
-               zoomin_effect = 1;
-               current_viewzoom = (1 / bound(1, autocvar_cl_spawnzoom_factor, 16));
+               if(autocvar_cl_spawnzoom && !autocvar_cl_lockview)
+               {
+                       zoomin_effect = 1;
+                       current_viewzoom = (1 / bound(1, autocvar_cl_spawnzoom_factor, 16));
+               }
 
                if(autocvar_cl_unpress_zoom_on_spawn)
                {