Merge branch 'master' into Mario/qc_camstuff

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 3546342a55f217af46f62dfd2cecb64fed36535a..47a38a2354f35b60b0472d841d3ad463c9c673c8 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -973,7 +973,7 @@ void HUD_Crosshair(entity this)
                // wcross_origin = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight;
                if(csqcplayer.viewloc && (csqcplayer.viewloc.spawnflags & VIEWLOC_FREEAIM))
                        wcross_origin = viewloc_mousepos;
-               else if(autocvar_chase_active && autocvar_crosshair_chase)
+               else if(autocvar_chase_active > 0 && autocvar_crosshair_chase)
                {
                        vector player_org = ((csqcplayer) ? csqcplayer.origin + csqcplayer.view_ofs : view_origin);
                        if(csqcplayer && crosshair_chase_playeralpha && crosshair_chase_playeralpha < 1)