From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 24 Jun 2010 16:10:44 +0000 (+0300)
Subject: Prevent reticle from showing during the respawn zoom effect or for spectators
X-Git-Tag: xonotic-v0.1.0preview~501^2~1^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2abe82f6b1f6c93466452dae77ab451ea6229c4b;p=xonotic%2Fxonotic-data.pk3dir.git

Prevent reticle from showing during the respawn zoom effect or for spectators
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index c65da4c5cf..0d2f138ea8 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -556,7 +556,9 @@ void CSQC_UpdateView(float w, float h)
 	// reticle_type is changed to the item we are zooming / aiming with, to decide which reticle to use
 	// It must be a persisted float for fading out to work properly (you let go of the zoom button for the
 	// view to go back to normal, so reticle_type would become 0 as we fade out and use that image instead)
-	if(button_zoom)
+	if(spectatee_status || getstati(STAT_HEALTH) <= 0)
+		reticle_type = -1; // prevent reticle from showing during the respawn zoom effect or for spectators
+	else if(button_zoom)
 		reticle_type = 0; // normal zoom
 	else if(activeweapon == WEP_NEX && button_attack2)
 		reticle_type = 1; // nex zoom