From: FruitieX <rasse@rasse-laptop.(none)>
Date: Wed, 13 Oct 2010 08:40:03 +0000 (+0300)
Subject: use the scope reticle when +zooming with the nex or CR
X-Git-Tag: xonotic-v0.1.0preview~307^2~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7483a17e21be64aeeb9dce99f862358fd262b8cd;p=xonotic%2Fxonotic-data.pk3dir.git

use the scope reticle when +zooming with the nex or CR
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index db0f630b9..b82e43822 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -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)