]> 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)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 10 Jan 2013 05:36:54 +0000 (05:36 +0000)
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

cl_particles.c

index d1b3b7a2fd0edaf2281c1b9a14c19640c6274451..dec40e55f10c0574bad4392443ba5e085795f0fe 100644 (file)
@@ -1568,8 +1568,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);