From: Mario <mario@smbclan.net>
Date: Sat, 24 Dec 2016 10:15:20 +0000 (+1000)
Subject: Make sure weapon's reticle image is also not null
X-Git-Tag: xonotic-v0.8.2~326^2~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=90f2b8e17381d5598c79a96a7dc669ef2bd1a614;p=xonotic%2Fxonotic-data.pk3dir.git

Make sure weapon's reticle image is also not null
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 63a0aef27..6dce9eb49 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1962,7 +1962,7 @@ 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 != "")
+				if(wep.w_reticle && wep.w_reticle != "")
 				{
 					reticle_image = wep.w_reticle;
 					break; // we can only draw 1 reticle