]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
We need to keep checking the other weapon entities for zoom state, unfortunately
authorMario <mario@smbclan.net>
Sat, 24 Dec 2016 10:30:37 +0000 (20:30 +1000)
committerMario <mario@smbclan.net>
Sat, 24 Dec 2016 10:30:37 +0000 (20:30 +1000)
qcsrc/client/view.qc

index 6dce9eb49cbd9aaee10a7a642c8040a78ccb672f..28160224ae2d6b70239a01ddd7cdb754a570fa5b 100644 (file)
@@ -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;
                        }
                }