From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 27 Jul 2010 19:44:58 +0000 (+0200)
Subject: detect zoom scripts in reticle code too
X-Git-Tag: xonotic-v0.1.0preview~383^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2fda635a8e57c6805965df3f38d50b182e1dd08f;p=xonotic%2Fxonotic-data.pk3dir.git

detect zoom scripts in reticle code too
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 3033cfa78..bbd337d0f 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -564,7 +564,7 @@ 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(button_zoom)
+	else if(button_zoom || zoomscript_caught)
 		reticle_type = 1; // normal zoom
 	else if(activeweapon == WEP_NEX && button_attack2 || activeweapon == WEP_CAMPINGRIFLE && button_attack2)
 		reticle_type = 2; // nex zoom
@@ -584,17 +584,20 @@ void CSQC_UpdateView(float w, float h)
 		reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
 	}
 
+	f = current_zoomfraction;
+	if(zoomscript_caught)
+		f = 1;
 	if(cvar("cl_reticle_item_normal"))
 	{
 		precache_pic("gfx/reticle_normal");
-		if(reticle_type == 1 && current_zoomfraction)
-			drawpic(reticle_pos, "gfx/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL);
+		if(reticle_type == 1 && f)
+			drawpic(reticle_pos, "gfx/reticle_normal", reticle_size, '1 1 1', f * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL);
 	}
 	if(cvar("cl_reticle_item_nex"))
 	{
 		precache_pic("gfx/reticle_nex");
-		if(reticle_type == 2 && current_zoomfraction)
-			drawpic(reticle_pos, "gfx/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_nex"), DRAWFLAG_NORMAL);
+		if(reticle_type == 2 && f)
+			drawpic(reticle_pos, "gfx/reticle_nex", reticle_size, '1 1 1', f * cvar("cl_reticle_item_nex"), DRAWFLAG_NORMAL);
 	}
 
 	// Draw the mouse cursor