Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

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

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 117de38c496108d24874d35130917cdf5477a591..c23c51d20845e5571ed52e9942095e995e8322f8 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -107,10 +107,6 @@ vector GetCurrentFov(float fov)
        if(zoomspeed < 0.5 || zoomspeed > 16)
                        zoomspeed = 3.5;
 
-
-       float spawnzoomfactor = bound(1, autocvar_cl_spawnzoom_factor, 16);
-       float spawnzoomspeed = autocvar_cl_spawnzoom_speed;
-
        zoomdir = button_zoom;
        if(hud == HUD_NORMAL)
        if((activeweapon == WEP_NEX && nex_scope) || (activeweapon == WEP_RIFLE && rifle_scope)) // do NOT use switchweapon here
@@ -133,12 +129,11 @@ vector GetCurrentFov(float fov)
        {
                current_viewzoom = min(1, current_viewzoom + drawframetime);
        }
-       else if(zoomin_effect)
+       else if(autocvar_cl_spawnzoom && zoomin_effect)
        {
-               /*if(autocvar_cl_spawnzoom_type == 1) { current_viewzoom = (current_viewzoom + drawframetime * spawnzoomspeed * (1 - 1 / spawnzoomfactor)); }
-               else                                                            { */
+               float spawnzoomfactor = bound(1, autocvar_cl_spawnzoom_factor, 16);
                
-               current_viewzoom += (spawnzoomspeed * (spawnzoomfactor - current_viewzoom) * drawframetime); 
+               current_viewzoom += (autocvar_cl_spawnzoom_speed * (spawnzoomfactor - current_viewzoom) * drawframetime); 
                current_viewzoom = bound(1 / spawnzoomfactor, current_viewzoom, 1);
                if(current_viewzoom == 1) { zoomin_effect = 0; }
        }
@@ -254,7 +249,7 @@ float EnemyHitCheck()
        if(teamplay)
                if(t == myteam)
                        return SHOTTYPE_HITTEAM;
-       if(t == COLOR_SPECTATOR)
+       if(t == FL_SPECTATOR)
                return SHOTTYPE_HITWORLD;
        return SHOTTYPE_HITENEMY;
 }