]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Make sure weapon's reticle image is also not null
authorMario <mario@smbclan.net>
Sat, 24 Dec 2016 10:15:20 +0000 (20:15 +1000)
committerMario <mario@smbclan.net>
Sat, 24 Dec 2016 10:15:20 +0000 (20:15 +1000)
qcsrc/client/view.qc

index 63a0aef279706cdc7ec78d7c649c30734ee12856..6dce9eb49cbd9aaee10a7a642c8040a78ccb672f 100644 (file)
@@ -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