From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 10 Jan 2013 05:36:54 +0000 (+0000)
Subject: fix effectinfo.txt trail effects which were honoring the (time-based)
X-Git-Tag: xonotic-v0.8.0~154
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c3fa246e079a94d52379a8d5d6bd2b00f9fd30dd;p=xonotic%2Fdarkplaces.git

fix effectinfo.txt trail effects which were honoring the (time-based)
count parameter, trailspacing now completely overrides the count
parameter as was assumed by the previous change (11539) that passed time
as count, this only affected network entities (.traileffectnum or
.effects or .modelflags) but was clearly broken

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11877 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=d00aedb40af0c386f3e04030c07e348da28aff99
---

diff --git a/cl_particles.c b/cl_particles.c
index 8eb084b3..941c638e 100644
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -1575,8 +1575,8 @@ void CL_ParticleTrail(int effectnameindex, float pcount, const vec3_t originmins
 					VectorCopy(originmins, trailpos);
 					if (info->trailspacing > 0)
 					{
-						info->particleaccumulator += traillen / info->trailspacing * cl_particles_quality.value * pcount;
-						trailstep = info->trailspacing / cl_particles_quality.value / max(0.001, pcount);
+						info->particleaccumulator += traillen / info->trailspacing * cl_particles_quality.value;
+						trailstep = info->trailspacing / cl_particles_quality.value;
 						immediatebloodstain = false;
 
 						AnglesFromVectors(angles, traildir, NULL, false);