From: Mario Date: Wed, 28 Aug 2019 10:27:11 +0000 (+1000) Subject: Merge branch 'master' into Mario/qc_camstuff X-Git-Tag: xonotic-v0.8.5~1105^2~59^2~5 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=7d0df5ac293f4d6c163a663bdd215a9f06e257fc;hp=b411d9803e8e4cf16e52699a053515f8a809c017;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/qc_camstuff --- diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 3546342a5..47a38a235 100644 --- 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)