]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
fix effectinfo.txt trail effects which were honoring the (time-based)
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 10 Jan 2013 05:36:54 +0000 (05:36 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 27 Jul 2013 10:37:28 +0000 (12:37 +0200)
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

cl_particles.c

index 8eb084b31a7b186a5bfcde6e089f405638c046ab..941c638ec5e856db865649fd94bfb933f2b49621 100644 (file)
@@ -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);