From d687a0bb2c31cbe483344f9191a6c8c06f83e3d7 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 21 Dec 2016 17:43:27 +1000 Subject: [PATCH] Don't continue the loop if a valid reticle image is chosen, hopefully fixes a bad string crash --- qcsrc/client/view.qc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 52591b3fc..63a0aef27 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -1962,8 +1962,11 @@ 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(wep.w_reticle != "") + { reticle_image = wep.w_reticle; + break; // we can only draw 1 reticle + } wep_zoomed += do_zoom; } } @@ -1978,7 +1981,7 @@ void CSQC_UpdateView(entity this, float w, float h) } else if(wep_zoomed && autocvar_cl_reticle_weapon) { - if(reticle_image && reticle_image != "") { reticle_type = 2; } + if(reticle_image != "") { reticle_type = 2; } else { reticle_type = 0; } } else if(button_zoom || zoomscript_caught) -- 2.39.2