From: Mario <mario@smbclan.net>
Date: Sat, 24 Dec 2016 10:30:37 +0000 (+1000)
Subject: We need to keep checking the other weapon entities for zoom state, unfortunately
X-Git-Tag: xonotic-v0.8.2~326^2~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=071fcaeef66754c6471c0f84deb9cea6d607d39b;p=xonotic%2Fxonotic-data.pk3dir.git

We need to keep checking the other weapon entities for zoom state, unfortunately
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 6dce9eb49..28160224a 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1962,11 +1962,8 @@ void CSQC_UpdateView(entity this, float w, float h)
 			if(wep != WEP_Null && wep.wr_zoom)
 			{
 				bool do_zoom = wep.wr_zoom(wep, NULL);
-				if(wep.w_reticle && wep.w_reticle != "")
-				{
+				if(reticle_image == "" && wep.w_reticle && wep.w_reticle != "")
 					reticle_image = wep.w_reticle;
-					break; // we can only draw 1 reticle
-				}
 				wep_zoomed += do_zoom;
 			}
 		}