Commit 2e5a87f4 authored by Mario's avatar Mario

Avoid potentially drawing a 'bad string' (better to show no reticle at all...

Avoid potentially drawing a 'bad string' (better to show no reticle at all than to crash the client)
parent 4e7cb7b9
Pipeline #5700046 passed with stages
in 21 minutes and 39 seconds
......@@ -1953,7 +1953,7 @@ void CSQC_UpdateView(entity this, float w, float h)
if(autocvar_cl_reticle)
{
string reticle_image = "";
string reticle_image = string_null;
bool wep_zoomed = false;
for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
{
......@@ -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(reticle_image == "" && wep.w_reticle && wep.w_reticle != "")
if(!reticle_image && wep.w_reticle && wep.w_reticle != "")
reticle_image = wep.w_reticle;
wep_zoomed += do_zoom;
}
......@@ -1978,7 +1978,7 @@ void CSQC_UpdateView(entity this, float w, float h)
}
else if(wep_zoomed && autocvar_cl_reticle_weapon)
{
if(reticle_image != "") { reticle_type = 2; }
if(reticle_image) { reticle_type = 2; }
else { reticle_type = 0; }
}
else if(button_zoom || zoomscript_caught)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment