From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 2 Mar 2008 16:03:47 +0000 (+0000)
Subject: improved CL_ParticleTrail's check for unknown effect numbers
X-Git-Tag: xonotic-v0.1.0preview~2343
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79e43f1b2f8e91b9272739ee9a6a29fa6bab3128;p=xonotic%2Fdarkplaces.git

improved CL_ParticleTrail's check for unknown effect numbers


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8181 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_particles.c b/cl_particles.c
index 9647bdcf..eb98eb37 100644
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -1118,13 +1118,11 @@ void CL_ParticleTrail(int effectnameindex, float pcount, const vec3_t originmins
 {
 	vec3_t center;
 	qboolean found = false;
-	if (effectnameindex < 1 || effectnameindex >= MAX_PARTICLEEFFECTNAME)
+	if (effectnameindex < 1 || effectnameindex >= MAX_PARTICLEEFFECTNAME || !particleeffectname[effectnameindex][0])
 	{
 		Con_DPrintf("Unknown effect number %i received from server\n", effectnameindex);
-		return; // invalid effect index
-	}
-	if (!particleeffectname[effectnameindex][0])
 		return; // no such effect
+	}
 	VectorLerp(originmins, 0.5, originmaxs, center);
 	if (!cl_particles_quake.integer && particleeffectinfo[0].effectnameindex)
 	{