]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
use the scope reticle when +zooming with the nex or CR
authorFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 08:40:03 +0000 (11:40 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 08:40:03 +0000 (11:40 +0300)
qcsrc/client/View.qc

index db0f630b9f097775d4b29443116ab36028ee16df..b82e43822084cbb321d84053fc6a2cf787e5262c 100644 (file)
@@ -622,6 +622,8 @@ void CSQC_UpdateView(float w, float h)
        // the view to go back to normal, so reticle_type would become 0 as we fade out)
        if(spectatee_status || getstati(STAT_HEALTH) <= 0)
                reticle_type = 0; // prevent reticle from showing during the respawn zoom effect or for spectators
+       else if(activeweapon == WEP_NEX && (button_zoom || zoomscript_caught) || activeweapon == WEP_CAMPINGRIFLE && (button_zoom || zoomscript_caught))
+               reticle_type = 2; // nex zoom
        else if(button_zoom || zoomscript_caught)
                reticle_type = 1; // normal zoom
        else if(activeweapon == WEP_NEX && button_attack2 || activeweapon == WEP_CAMPINGRIFLE && button_attack2)