From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 29 Jul 2013 10:50:06 +0000 (+0000)
Subject: Treat attempts to draw trails with pointparticles as zero length trails.
X-Git-Tag: xonotic-v0.8.0~147
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0a8676255343bc2bcb11075daea9c86d7749f5e3;p=xonotic%2Fdarkplaces.git

Treat attempts to draw trails with pointparticles as zero length trails.

This means they will get dlight, and count/countabsolute do get applied.

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

diff --git a/cl_particles.c b/cl_particles.c
index bccd26e1..e6d404e2 100644
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -1505,10 +1505,6 @@ static void CL_NewParticlesFromEffectinfo(int effectnameindex, float pcount, con
 				if ((info->flags & PARTICLEEFFECT_NOTUNDERWATER) && underwater)
 					continue;
 
-				// trail effects may only ever be drawn as trail
-				if (!drawastrail && definedastrail)
-					continue;
-
 				// spawn a dlight if requested
 				if (info->lightradiusstart > 0 && spawndlight)
 				{
@@ -1564,6 +1560,9 @@ static void CL_NewParticlesFromEffectinfo(int effectnameindex, float pcount, con
 				}
 				else if (info->orientation == PARTICLE_HBEAM)
 				{
+					if (!drawastrail)
+						continue;
+
 					AnglesFromVectors(angles, traildir, NULL, false);
 					AngleVectors(angles, forward, right, up);
 					VectorMAMAM(info->relativeoriginoffset[0], forward, info->relativeoriginoffset[1], right, info->relativeoriginoffset[2], up, trailpos);
@@ -1572,6 +1571,7 @@ static void CL_NewParticlesFromEffectinfo(int effectnameindex, float pcount, con
 				}
 				else
 				{
+					float cnt;
 					if (!cl_particles.integer)
 						continue;
 					switch (info->particletype)
@@ -1584,35 +1584,42 @@ static void CL_NewParticlesFromEffectinfo(int effectnameindex, float pcount, con
 					case pt_snow: if (!cl_particles_snow.integer) continue;break;
 					default: break;
 					}
-					VectorCopy(originmins, trailpos);
+
+					cnt = info->countabsolute;
+					cnt += (pcount * info->countmultiplier) * cl_particles_quality.value;
+					// if drawastrail is not set, we will
+					// use the regular cnt-based random
+					// particle spawning at the center; so
+					// do NOT apply trailspacing then!
+					if (drawastrail && definedastrail)
+						cnt += (traillen / info->trailspacing) * cl_particles_quality.value;
+					cnt *= fade;
+					if (cnt == 0)
+						continue;  // nothing to draw
+					info->particleaccumulator += cnt;
+
+					if (drawastrail || definedastrail)
+						immediatebloodstain = false;
+					else
+						immediatebloodstain =
+							((cl_decals_newsystem_immediatebloodstain.integer >= 1) && (info->particletype == pt_blood))
+							||
+							((cl_decals_newsystem_immediatebloodstain.integer >= 2) && staintex);
+
 					if (drawastrail)
 					{
-						float cnt = info->countabsolute;
-						cnt += (pcount * info->countmultiplier) * cl_particles_quality.value;
-						if (info->trailspacing > 0)
-							cnt += (traillen / info->trailspacing) * cl_particles_quality.value;
-						cnt *= fade;
-						info->particleaccumulator += cnt;
+						VectorCopy(originmins, trailpos);
 						trailstep = traillen / cnt;
-						immediatebloodstain = false;
-
 						AnglesFromVectors(angles, traildir, NULL, false);
 					}
 					else
 					{
-						float cnt = info->countabsolute;
-						cnt += (pcount * info->countmultiplier) * cl_particles_quality.value;
-						cnt *= fade;
-						info->particleaccumulator += cnt;
+						VectorCopy(center, trailpos);
 						trailstep = 0;
-						immediatebloodstain =
-							((cl_decals_newsystem_immediatebloodstain.integer >= 1) && (info->particletype == pt_blood))
-							||
-							((cl_decals_newsystem_immediatebloodstain.integer >= 2) && staintex);
-
 						VectorMAM(0.5f, velocitymins, 0.5f, velocitymaxs, velocity);
 						AnglesFromVectors(angles, velocity, NULL, false);
 					}
+
 					AngleVectors(angles, forward, right, up);
 					VectorMAMAMAM(1.0f, trailpos, info->relativeoriginoffset[0], forward, info->relativeoriginoffset[1], right, info->relativeoriginoffset[2], up, trailpos);
 					VectorMAMAM(info->relativevelocityoffset[0], forward, info->relativevelocityoffset[1], right, info->relativevelocityoffset[2], up, velocity);
@@ -1624,7 +1631,7 @@ static void CL_NewParticlesFromEffectinfo(int effectnameindex, float pcount, con
 							tex = (int)lhrandom(info->tex[0], info->tex[1]);
 							tex = min(tex, info->tex[1] - 1);
 						}
-						if (!trailstep)
+						if (!(drawastrail || definedastrail))
 						{
 							trailpos[0] = lhrandom(originmins[0], originmaxs[0]);
 							trailpos[1] = lhrandom(originmins[1], originmaxs[1]);