X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_particles.c;h=d658b7b6e43bd8e425e25a418016101db6f4b7b2;hp=8b80cadddc7c0127772d25ae927664270161f59d;hb=16742571f9a7d696a654668febdc10b4f4affd57;hpb=ded16fd66f1a999d35ee57f989f881f205a428c7

diff --git a/cl_particles.c b/cl_particles.c
index 8b80cadd..d658b7b6 100644
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -521,7 +521,7 @@ void CL_SpawnDecalParticleForPoint(const vec3_t org, float maxdist, float size,
 	{
 		VectorRandom(org2);
 		VectorMA(org, maxdist, org2, org2);
-		trace = CL_TraceBox(org, vec3_origin, vec3_origin, org2, true, &hitent, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY, false);
+		trace = CL_Move(org, vec3_origin, vec3_origin, org2, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY, true, false, &hitent, false);
 		// take the closest trace result that doesn't end up hitting a NOMARKS
 		// surface (sky for example)
 		if (bestfrac > trace.fraction && !(trace.hitq3surfaceflags & Q3SURFACEFLAG_NOMARKS))
@@ -1324,7 +1324,7 @@ void CL_ParticleExplosion (const vec3_t org)
 						v[0] = org[0] + lhrandom(-48, 48);
 						v[1] = org[1] + lhrandom(-48, 48);
 						v[2] = org[2] + lhrandom(-48, 48);
-						trace = CL_TraceBox(org, vec3_origin, vec3_origin, v, true, NULL, SUPERCONTENTS_SOLID, false);
+						trace = CL_Move(org, vec3_origin, vec3_origin, v, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false);
 						if (trace.fraction >= 0.1)
 							break;
 					}
@@ -1534,7 +1534,7 @@ void CL_MoveParticles (void)
 			VectorCopy(p->org, org);
 			if (p->bounce)
 			{
-				trace = CL_TraceBox(oldorg, vec3_origin, vec3_origin, p->org, true, &hitent, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | (p->type == particletype + pt_rain ? SUPERCONTENTS_LIQUIDSMASK : 0), false);
+				trace = CL_Move(oldorg, vec3_origin, vec3_origin, p->org, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | (p->type == particletype + pt_rain ? SUPERCONTENTS_LIQUIDSMASK : 0), true, false, &hitent, false);
 				// if the trace started in or hit something of SUPERCONTENTS_NODROP
 				// or if the trace hit something flagged as NOIMPACT
 				// then remove the particle