X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_particles.c;h=ba62bcecff480426f80e6b5961297d29ab477bbf;hp=90d669cae6eef2bd61afe97c36c7bbd79d6433ba;hb=69a003b5def5ea2ece7310d3b35b62bf023c29b1;hpb=20a84091d5ad3d37c60c825e5cc8d2bcad564bc6

diff --git a/cl_particles.c b/cl_particles.c
index 90d669ca..ba62bcec 100644
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -19,35 +19,43 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "cl_collision.h"
 
 #define MAX_PARTICLES			16384	// default max # of particles at one time
 #define ABSOLUTE_MIN_PARTICLES	512		// no fewer than this no matter what's on the command line
 
 typedef enum
 {
-	pt_static, pt_grav, pt_blob, pt_blob2, pt_bulletsmoke, pt_smoke, pt_snow, pt_rain, pt_spark, pt_bubble, pt_fade, pt_steam, pt_splash, pt_splashpuff, pt_flame, pt_blood, pt_oneframe, pt_lavasplash, pt_raindropsplash, pt_underwaterspark, pt_explosionsplash
+	pt_static, pt_rain, pt_bubble, pt_blood
 }
 ptype_t;
 
+#define P_TEXNUM_FIRSTBIT 0
+#define P_TEXNUM_BITS 6
+#define P_ORIENTATION_FIRSTBIT (P_TEXNUM_FIRSTBIT + P_TEXNUM_BITS)
+#define P_ORIENTATION_BITS 2
+#define P_FLAGS_FIRSTBIT (P_ORIENTATION_FIRSTBIT + P_ORIENTATION_BITS)
+#define P_DYNLIGHT (1 << (P_FLAGS_FIRSTBIT + 0))
+#define P_ADDITIVE (1 << (P_FLAGS_FIRSTBIT + 1))
+
 typedef struct particle_s
 {
 	ptype_t		type;
-	int			orientation; // typically PARTICLE_BILLBOARD
+	unsigned int	flags; // dynamically lit, orientation, additive blending, texnum
 	vec3_t		org;
 	vec3_t		vel;
-	int			additive;
-	int			tex;
 	float		die;
 	float		scalex;
 	float		scaley;
 	float		alpha; // 0-255
+	float		alphafade; // how much alpha reduces per second
 	float		time2; // used for various things (snow fluttering, for example)
 	float		bounce; // how much bounce-back from a surface the particle hits (0 = no physics, 1 = stop and slide, 2 = keep bouncing forever, 1.5 is typical)
+	float		gravity; // how much gravity affects this particle (1.0 = normal gravity, 0.0 = none)
 	vec3_t		oldorg;
 	vec3_t		vel2; // used for snow fluttering (base velocity, wind for instance)
 	float		friction; // how much air friction affects this object (objects with a low mass/size ratio tend to get more air friction)
 	float		pressure; // if non-zero, apply pressure to other particles
-	int			dynlight; // if set the particle will be dynamically lit (if cl_dynamicparticles is on), used for smoke and blood
 	qbyte		color[4];
 }
 particle_t;
@@ -88,8 +96,7 @@ static int particlepalette[256] =
 	0x8b0000,0xb30000,0xd70000,0xff0000,0xfff393,0xfff7c7,0xffffff,0x9f5b53
 };
 
-static int explosparkramp[8] = {0x4b0700, 0x6f0f00, 0x931f07, 0xb7330f, 0xcf632b, 0xe3974f, 0xffe7b5, 0xffffff};
-//static int explounderwatersparkramp[8] = {0x00074b, 0x000f6f, 0x071f93, 0x0f33b7, 0x2b63cf, 0x4f97e3, 0xb5e7ff, 0xffffff};
+//static int explosparkramp[8] = {0x4b0700, 0x6f0f00, 0x931f07, 0xb7330f, 0xcf632b, 0xe3974f, 0xffe7b5, 0xffffff};
 
 // these must match r_part.c's textures
 static const int tex_smoke[8] = {0, 1, 2, 3, 4, 5, 6, 7};
@@ -97,25 +104,22 @@ static const int tex_rainsplash[16] = {8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
 static const int tex_particle = 24;
 static const int tex_rain = 25;
 static const int tex_bubble = 26;
-static const int tex_rocketglow = 27;
 
 static int			cl_maxparticles;
 static int			cl_numparticles;
 static particle_t	*particles;
 static particle_t	**freeparticles; // list used only in compacting particles array
-//static renderparticle_t	*cl_renderparticles;
-
-static cvar_t cl_particles = {CVAR_SAVE, "cl_particles", "1"};
-static cvar_t cl_particles_size = {CVAR_SAVE, "cl_particles_size", "1"};
-static cvar_t cl_particles_bloodshowers = {CVAR_SAVE, "cl_particles_bloodshowers", "1"};
-static cvar_t cl_particles_blood = {CVAR_SAVE, "cl_particles_blood", "1"};
-static cvar_t cl_particles_blood_size_min = {CVAR_SAVE, "cl_particles_blood_size_min", "3"};
-static cvar_t cl_particles_blood_size_max = {CVAR_SAVE, "cl_particles_blood_size_max", "15"};
-static cvar_t cl_particles_blood_alpha = {CVAR_SAVE, "cl_particles_blood_alpha", "1"};
-static cvar_t cl_particles_smoke = {CVAR_SAVE, "cl_particles_smoke", "1"};
-static cvar_t cl_particles_sparks = {CVAR_SAVE, "cl_particles_sparks", "1"};
-static cvar_t cl_particles_bubbles = {CVAR_SAVE, "cl_particles_bubbles", "1"};
-static cvar_t cl_particles_explosions = {CVAR_SAVE, "cl_particles_explosions", "0"};
+
+cvar_t cl_particles = {CVAR_SAVE, "cl_particles", "1"};
+cvar_t cl_particles_size = {CVAR_SAVE, "cl_particles_size", "1"};
+cvar_t cl_particles_bloodshowers = {CVAR_SAVE, "cl_particles_bloodshowers", "1"};
+cvar_t cl_particles_blood = {CVAR_SAVE, "cl_particles_blood", "1"};
+cvar_t cl_particles_blood_size = {CVAR_SAVE, "cl_particles_blood_size", "8"};
+cvar_t cl_particles_blood_alpha = {CVAR_SAVE, "cl_particles_blood_alpha", "0.5"};
+cvar_t cl_particles_bulletimpacts = {CVAR_SAVE, "cl_particles_bulletimpacts", "1"};
+cvar_t cl_particles_smoke = {CVAR_SAVE, "cl_particles_smoke", "1"};
+cvar_t cl_particles_sparks = {CVAR_SAVE, "cl_particles_sparks", "1"};
+cvar_t cl_particles_bubbles = {CVAR_SAVE, "cl_particles_bubbles", "1"};
 
 static mempool_t *cl_part_mempool;
 
@@ -136,7 +140,7 @@ void CL_Particles_Init (void)
 
 	i = COM_CheckParm ("-particles");
 
-	if (i)
+	if (i && i < com_argc - 1)
 	{
 		cl_maxparticles = (int)(atoi(com_argv[i+1]));
 		if (cl_maxparticles < ABSOLUTE_MIN_PARTICLES)
@@ -151,57 +155,74 @@ void CL_Particles_Init (void)
 	Cvar_RegisterVariable (&cl_particles_size);
 	Cvar_RegisterVariable (&cl_particles_bloodshowers);
 	Cvar_RegisterVariable (&cl_particles_blood);
-	Cvar_RegisterVariable (&cl_particles_blood_size_min);
-	Cvar_RegisterVariable (&cl_particles_blood_size_max);
+	Cvar_RegisterVariable (&cl_particles_blood_size);
 	Cvar_RegisterVariable (&cl_particles_blood_alpha);
+	Cvar_RegisterVariable (&cl_particles_bulletimpacts);
 	Cvar_RegisterVariable (&cl_particles_smoke);
 	Cvar_RegisterVariable (&cl_particles_sparks);
 	Cvar_RegisterVariable (&cl_particles_bubbles);
-	Cvar_RegisterVariable (&cl_particles_explosions);
 
 	cl_part_mempool = Mem_AllocPool("CL_Part");
 	particles = (particle_t *) Mem_Alloc(cl_part_mempool, cl_maxparticles * sizeof(particle_t));
 	freeparticles = (void *) Mem_Alloc(cl_part_mempool, cl_maxparticles * sizeof(particle_t *));
 	cl_numparticles = 0;
-
-	// FIXME: r_refdef stuff should be allocated somewhere else?
-	//r_refdef.particles = cl_renderparticles = Mem_Alloc(cl_refdef_mempool, cl_maxparticles * sizeof(renderparticle_t));
 }
 
-#define particle(ptype, porientation, pcolor, ptex, plight, padditive, pscalex, pscaley, palpha, ptime, pbounce, px, py, pz, pvx, pvy, pvz, ptime2, pvx2, pvy2, pvz2, pfriction, ppressure)\
+#define particle(ptype, porientation, pcolor1, pcolor2, ptex, plight, padditive, pscalex, pscaley, palpha, palphafade, ptime, pgravity, pbounce, px, py, pz, pvx, pvy, pvz, ptime2, pvx2, pvy2, pvz2, pfriction, ppressure)\
 {\
-	particle_t	*part;\
-	int tempcolor;\
 	if (cl_numparticles >= cl_maxparticles)\
 		return;\
-	part = &particles[cl_numparticles++];\
-	part->type = (ptype);\
-	tempcolor = (pcolor);\
-	part->color[0] = ((tempcolor) >> 16) & 0xFF;\
-	part->color[1] = ((tempcolor) >> 8) & 0xFF;\
-	part->color[2] = (tempcolor) & 0xFF;\
-	part->color[3] = 0xFF;\
-	part->tex = (ptex);\
-	part->orientation = (porientation);\
-	part->dynlight = (plight);\
-	part->additive = (padditive);\
-	part->scalex = (pscalex);\
-	part->scaley = (pscaley);\
-	part->alpha = (palpha);\
-	part->die = cl.time + (ptime);\
-	part->bounce = (pbounce);\
-	part->org[0] = (px);\
-	part->org[1] = (py);\
-	part->org[2] = (pz);\
-	part->vel[0] = (pvx);\
-	part->vel[1] = (pvy);\
-	part->vel[2] = (pvz);\
-	part->time2 = (ptime2);\
-	part->vel2[0] = (pvx2);\
-	part->vel2[1] = (pvy2);\
-	part->vel2[2] = (pvz2);\
-	part->friction = (pfriction);\
-	part->pressure = (ppressure);\
+	{\
+		particle_t	*part;\
+		int tempcolor, tempcolor2, cr1, cg1, cb1, cr2, cg2, cb2;\
+		unsigned int partflags;\
+		partflags = ((porientation) << P_ORIENTATION_FIRSTBIT) | ((ptex) << P_TEXNUM_FIRSTBIT);\
+		if (padditive)\
+			partflags |= P_ADDITIVE;\
+		if (plight)\
+			partflags |= P_DYNLIGHT;\
+		tempcolor = (pcolor1);\
+		tempcolor2 = (pcolor2);\
+		cr2 = ((tempcolor2) >> 16) & 0xFF;\
+		cg2 = ((tempcolor2) >> 8) & 0xFF;\
+		cb2 = (tempcolor2) & 0xFF;\
+		if (tempcolor != tempcolor2)\
+		{\
+			cr1 = ((tempcolor) >> 16) & 0xFF;\
+			cg1 = ((tempcolor) >> 8) & 0xFF;\
+			cb1 = (tempcolor) & 0xFF;\
+			tempcolor = rand() & 0xFF;\
+			cr2 = (((cr2 - cr1) * tempcolor) >> 8) + cr1;\
+			cg2 = (((cg2 - cg1) * tempcolor) >> 8) + cg1;\
+			cb2 = (((cb2 - cb1) * tempcolor) >> 8) + cb1;\
+		}\
+		part = &particles[cl_numparticles++];\
+		part->type = (ptype);\
+		part->color[0] = cr2;\
+		part->color[1] = cg2;\
+		part->color[2] = cb2;\
+		part->color[3] = 0xFF;\
+		part->flags = partflags;\
+		part->scalex = (pscalex);\
+		part->scaley = (pscaley);\
+		part->alpha = (palpha);\
+		part->alphafade = (palphafade);\
+		part->die = cl.time + (ptime);\
+		part->gravity = (pgravity);\
+		part->bounce = (pbounce);\
+		part->org[0] = (px);\
+		part->org[1] = (py);\
+		part->org[2] = (pz);\
+		part->vel[0] = (pvx);\
+		part->vel[1] = (pvy);\
+		part->vel[2] = (pvz);\
+		part->time2 = (ptime2);\
+		part->vel2[0] = (pvx2);\
+		part->vel2[1] = (pvy2);\
+		part->vel2[2] = (pvz2);\
+		part->friction = (pfriction);\
+		part->pressure = (ppressure);\
+	}\
 }
 
 /*
@@ -240,7 +261,7 @@ void CL_EntityParticles (entity_t *ent)
 		forward[1] = cp*sy;
 		forward[2] = -sp;
 
-		particle(pt_oneframe, PARTICLE_BILLBOARD, particlepalette[0x6f], tex_particle, false, false, 2, 2, 255, 9999, 0, ent->render.origin[0] + m_bytenormals[i][0]*dist + forward[0]*beamlength, ent->render.origin[1] + m_bytenormals[i][1]*dist + forward[1]*beamlength, ent->render.origin[2] + m_bytenormals[i][2]*dist + forward[2]*beamlength, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+		particle(pt_static, PARTICLE_BILLBOARD, particlepalette[0x6f], particlepalette[0x6f], tex_particle, false, false, 2, 2, 255, 0, 0, 0, 0, ent->render.origin[0] + m_bytenormals[i][0]*dist + forward[0]*beamlength, ent->render.origin[1] + m_bytenormals[i][1]*dist + forward[1]*beamlength, ent->render.origin[2] + m_bytenormals[i][2]*dist + forward[2]*beamlength, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 	}
 }
 
@@ -284,7 +305,7 @@ void CL_ReadPointFile_f (void)
 			Con_Printf ("Not enough free particles\n");
 			break;
 		}
-		particle(pt_static, PARTICLE_BILLBOARD, particlepalette[(-c)&15], tex_particle, false, false, 2, 2, 255, 99999, 0, org[0], org[1], org[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
+		particle(pt_static, PARTICLE_BILLBOARD, particlepalette[(-c)&15], particlepalette[(-c)&15], tex_particle, false, false, 2, 2, 255, 0, 99999, 0, 0, org[0], org[1], org[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
 	}
 
 	Mem_Free(pointfile);
@@ -326,87 +347,21 @@ CL_ParticleExplosion
 */
 void CL_ParticleExplosion (vec3_t org, int smoke)
 {
-	R_Stain(org, 96, 80, 80, 80, 128, 176, 176, 176, 128);
-	if (cl_particles.integer && cl_particles_explosions.integer)
-	{
-		int i, j;
-		float f;
-		vec3_t v, end, ang;
-		qbyte noise1[32*32], noise2[32*32];
-
-		VectorClear(end); // hush MSVC
-		i = Mod_PointInLeaf(org, cl.worldmodel)->contents;
-		if (i == CONTENTS_SLIME || i == CONTENTS_WATER)
-		{
-			for (i = 0;i < 128;i++)
-				particle(pt_bubble, PARTICLE_BILLBOARD, 0xFFFFFF, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, org[0] + lhrandom(-16, 16), org[1] + lhrandom(-16, 16), org[2] + lhrandom(-16, 16), lhrandom(-96, 96), lhrandom(-96, 96), lhrandom(-96, 96), 0, 0, 0, 0, 0, 0);
+	int i;
+	if (cl_stainmaps.integer)
+		R_Stain(org, 96, 80, 80, 80, 128, 176, 176, 176, 128);
 
-			ang[2] = lhrandom(0, 360);
-			fractalnoisequick(noise1, 32, 4);
-			fractalnoisequick(noise2, 32, 8);
-			for (i = 0;i < 32;i++)
-			{
-				for (j = 0;j < 32;j++)
-				{
-					VectorRandom(v);
-					VectorMA(org, 16, v, v);
-					TraceLine(org, v, end, NULL, 0, true);
-					ang[0] = (j + 0.5f) * (360.0f / 32.0f);
-					ang[1] = (i + 0.5f) * (360.0f / 32.0f);
-					AngleVectors(ang, v, NULL, NULL);
-					f = noise1[j*32+i] * 1.5f;
-					VectorScale(v, f, v);
-					particle(pt_underwaterspark, PARTICLE_BILLBOARD, noise2[j*32+i] * 0x010101, tex_smoke[rand()&7], false, true, 10, 10, lhrandom(128, 255), 9999, 1.5, end[0], end[1], end[2], v[0], v[1], v[2], 512.0f, 0, 0, 0, 2, 0);
-					VectorScale(v, 0.75, v);
-					particle(pt_underwaterspark, PARTICLE_BILLBOARD, explosparkramp[(noise2[j*32+i] >> 5)], tex_particle, false, true, 10, 10, lhrandom(128, 255), 9999, 1.5, end[0], end[1], end[2], v[0], v[1], v[2], 512.0f, 0, 0, 0, 2, 0);
-				}
-			}
-		}
-		else
-		{
-			ang[2] = lhrandom(0, 360);
-			fractalnoisequick(noise1, 32, 4);
-			fractalnoisequick(noise2, 32, 8);
-			for (i = 0;i < 32;i++)
-			{
-				for (j = 0;j < 32;j++)
-				{
-					VectorRandom(v);
-					VectorMA(org, 16, v, v);
-					TraceLine(org, v, end, NULL, 0, true);
-					ang[0] = (j + 0.5f) * (360.0f / 32.0f);
-					ang[1] = (i + 0.5f) * (360.0f / 32.0f);
-					AngleVectors(ang, v, NULL, NULL);
-					f = noise1[j*32+i] * 1.5f;
-					VectorScale(v, f, v);
-					particle(pt_spark, PARTICLE_BILLBOARD, noise2[j*32+i] * 0x010101, tex_smoke[rand()&7], false, true, 10, 10, lhrandom(128, 255), 9999, 1.5, end[0], end[1], end[2], v[0], v[1], v[2] + 160.0f, 512.0f, 0, 0, 0, 2, 0);
-					VectorScale(v, 0.75, v);
-					particle(pt_spark, PARTICLE_BILLBOARD, explosparkramp[(noise2[j*32+i] >> 5)], tex_particle, false, true, 10, 10, lhrandom(128, 255), 9999, 1.5, end[0], end[1], end[2], v[0], v[1], v[2] + 160.0f, 512.0f, 0, 0, 0, 2, 0);
-				//	VectorRandom(v);
-				//	VectorScale(v, 384, v);
-				//	particle(pt_spark, PARTICLE_BILLBOARD, explosparkramp[rand()&7], tex_particle, false, true, 2, 2, lhrandom(16, 255), 9999, 1.5, end[0], end[1], end[2], v[0], v[1], v[2] + 160.0f, 512.0f, 0, 0, 0, 2, 0);
-				}
-			}
-		}
-	}
-	else
+	i = Mod_PointInLeaf(org, cl.worldmodel)->contents;
+	if ((i == CONTENTS_SLIME || i == CONTENTS_WATER) && cl_particles.integer && cl_particles_bubbles.integer)
 	{
-		/*
-		int i;
-		vec3_t v;
-		for (i = 0;i < 256;i++)
+		for (i = 0;i < 128;i++)
 		{
-			do
-			{
-				VectorRandom(v);
-			}
-			while(DotProduct(v,v) < 0.75);
-			VectorScale(v, 512, v);
-			particle(pt_spark, PARTICLE_BILLBOARD, explosparkramp[rand()&7], tex_particle, false, true, 4, 4, 255, 9999, 1.5, org[0], org[1], org[2], v[0], v[1], v[2] + 160.0f, 512.0f, 0, 0, 0, 2, 0);
+			particle(pt_bubble, PARTICLE_BILLBOARD, 0x404040, 0x808080, tex_bubble, false, true, 2, 2, lhrandom(128, 255), 256, 9999, -0.25, 1.5, org[0] + lhrandom(-16, 16), org[1] + lhrandom(-16, 16), org[2] + lhrandom(-16, 16), lhrandom(-96, 96), lhrandom(-96, 96), lhrandom(-96, 96), 0, 0, 0, 0, (1.0 / 16.0), 0);
 		}
-		*/
-		R_NewExplosion(org);
 	}
+
+	if (cl_explosions.integer)
+		R_NewExplosion(org);
 }
 
 /*
@@ -417,11 +372,14 @@ CL_ParticleExplosion2
 */
 void CL_ParticleExplosion2 (vec3_t org, int colorStart, int colorLength)
 {
-	int			i;
+	int i, k;
 	if (!cl_particles.integer) return;
 
 	for (i = 0;i < 512;i++)
-		particle(pt_fade, PARTICLE_BILLBOARD, particlepalette[colorStart + (i % colorLength)], tex_particle, false, false, 1.5, 1.5, 255, 0.3, 0, org[0] + lhrandom(-8, 8), org[1] + lhrandom(-8, 8), org[2] + lhrandom(-8, 8), lhrandom(-192, 192), lhrandom(-192, 192), lhrandom(-192, 192), 384, 0, 0, 0, 1, 0);
+	{
+		k = particlepalette[colorStart + (i % colorLength)];
+		particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, false, 1.5, 1.5, 255, 384, 0.3, 0, 0, org[0] + lhrandom(-8, 8), org[1] + lhrandom(-8, 8), org[2] + lhrandom(-8, 8), lhrandom(-192, 192), lhrandom(-192, 192), lhrandom(-192, 192), 0, 0, 0, 0, 1, 0);
+	}
 }
 
 /*
@@ -432,18 +390,11 @@ CL_BlobExplosion
 */
 void CL_BlobExplosion (vec3_t org)
 {
-	//int i;
-	if (!cl_particles.integer) return;
+	if (cl_stainmaps.integer)
+		R_Stain(org, 96, 80, 80, 80, 128, 176, 176, 176, 128);
 
-	R_Stain(org, 96, 80, 80, 80, 128, 176, 176, 176, 128);
-	//R_Stain(org, 96, 96, 64, 96, 128, 160, 128, 160, 128);
-
-	R_NewExplosion(org);
-
-	//for (i = 0;i < 256;i++)
-	//	particle(pt_blob , PARTICLE_BILLBOARD, particlepalette[ 66+(rand()%6)], tex_particle, false, true, 4, 4, 255, 9999, 0, org[0] + lhrandom(-16, 16), org[1] + lhrandom(-16, 16), org[2] + lhrandom(-16, 16), lhrandom(-4, 4), lhrandom(-4, 4), lhrandom(-128, 128), 0, 0, 0, 0, 0, 0);
-	//for (i = 0;i < 256;i++)
-	//	particle(pt_blob2, PARTICLE_BILLBOARD, particlepalette[150+(rand()%6)], tex_particle, false, true, 4, 4, 255, 9999, 0, org[0] + lhrandom(-16, 16), org[1] + lhrandom(-16, 16), org[2] + lhrandom(-16, 16), lhrandom(-4, 4), lhrandom(-4, 4), lhrandom(-128, 128), 0, 0, 0, 0, 0, 0);
+	if (cl_explosions.integer)
+		R_NewExplosion(org);
 }
 
 /*
@@ -454,15 +405,19 @@ CL_RunParticleEffect
 */
 void CL_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count)
 {
-	if (!cl_particles.integer) return;
+	int k;
 
 	if (count == 1024)
 	{
 		CL_ParticleExplosion(org, false);
 		return;
 	}
+	if (!cl_particles.integer) return;
 	while (count--)
-		particle(pt_fade, PARTICLE_BILLBOARD, particlepalette[color + (rand()&7)], tex_particle, false, false, 1, 1, 128, 9999, 0, org[0] + lhrandom(-8, 8), org[1] + lhrandom(-8, 8), org[2] + lhrandom(-8, 8), lhrandom(-15, 15), lhrandom(-15, 15), lhrandom(-15, 15), 384, 0, 0, 0, 0, 0);
+	{
+		k = particlepalette[color + (rand()&7)];
+		particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, false, 1, 1, 255, 512, 9999, 0, 0, org[0] + lhrandom(-8, 8), org[1] + lhrandom(-8, 8), org[2] + lhrandom(-8, 8), lhrandom(-15, 15), lhrandom(-15, 15), lhrandom(-15, 15), 0, 0, 0, 0, 0, 0);
+	}
 }
 
 // LordHavoc: added this for spawning sparks/dust (which have strong gravity)
@@ -473,34 +428,41 @@ CL_SparkShower
 */
 void CL_SparkShower (vec3_t org, vec3_t dir, int count)
 {
+	int k;
 	if (!cl_particles.integer) return;
 
-	R_Stain(org, 32, 96, 96, 96, 32, 128, 128, 128, 32);
-
-	// smoke puff
-	if (cl_particles_smoke.integer)
-		particle(pt_bulletsmoke, PARTICLE_BILLBOARD, 0xFFFFFF /*0xA0A0A0*/, tex_smoke[rand()&7], true, true, 2, 2, 255, 9999, 0, org[0], org[1], org[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(0, 16), 0, 0, 0, 0, 0, 0);
+	if (cl_stainmaps.integer)
+		R_Stain(org, 32, 96, 96, 96, 32, 128, 128, 128, 32);
 
-	if (cl_particles_sparks.integer)
+	if (cl_particles_bulletimpacts.integer)
 	{
-		// sparks
-		while(count--)
-			particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 1, 1, lhrandom(64, 128), 9999, 0, org[0], org[1], org[2], lhrandom(-64, 64) + dir[0], lhrandom(-64, 64) + dir[1], lhrandom(0, 128) + dir[2], 480, 0, 0, 0, 1, 0);
+		// smoke puff
+		if (cl_particles_smoke.integer)
+			particle(pt_static, PARTICLE_BILLBOARD, 0x606060, 0xA0A0A0, tex_smoke[rand()&7], true, true, 4, 4, 255, 1024, 9999, -0.2, 0, org[0], org[1], org[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(0, 16), 0, 0, 0, 0, 0, 0);
+
+		if (cl_particles_sparks.integer)
+		{
+			// sparks
+			while(count--)
+			{
+				k = particlepalette[0x68 + (rand() & 7)];
+				particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 1, 1, lhrandom(64, 255), 512, 9999, 1, 0, org[0], org[1], org[2], lhrandom(-64, 64) + dir[0], lhrandom(-64, 64) + dir[1], lhrandom(0, 128) + dir[2], 0, 0, 0, 0, 0, 0);
+			}
+		}
 	}
 }
 
 void CL_PlasmaBurn (vec3_t org)
 {
-	if (!cl_particles.integer) return;
-
-	R_Stain(org, 48, 96, 96, 96, 48, 128, 128, 128, 48);
+	if (cl_stainmaps.integer)
+		R_Stain(org, 48, 96, 96, 96, 48, 128, 128, 128, 48);
 }
 
+static float bloodcount = 0;
 void CL_BloodPuff (vec3_t org, vec3_t vel, int count)
 {
-	float r, s;
+	float s, r, a;
 	// bloodcount is used to accumulate counts too small to cause a blood particle
-	static int bloodcount = 0;
 	if (!cl_particles.integer) return;
 	if (!cl_particles_blood.integer) return;
 
@@ -509,18 +471,19 @@ void CL_BloodPuff (vec3_t org, vec3_t vel, int count)
 	if (count > 1000)
 		count = 1000;
 	bloodcount += count;
+	r = cl_particles_blood_size.value;
+	a = cl_particles_blood_alpha.value * 255;
 	while(bloodcount > 0)
 	{
-		r = lhrandom(cl_particles_blood_size_min.value, cl_particles_blood_size_max.value);
-		particle(pt_blood, PARTICLE_BILLBOARD, 0x300000, tex_smoke[rand()&7], true, false, r, r, cl_particles_blood_alpha.value * 255, 9999, -1, org[0], org[1], org[2], vel[0] + lhrandom(-s, s), vel[1] + lhrandom(-s, s), vel[2] + lhrandom(-s, s), 0, 0, 0, 0, 1, 0);
+		particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, r, r, a, a * 0.5, 9999, 0, -1, org[0], org[1], org[2], vel[0] + lhrandom(-s, s), vel[1] + lhrandom(-s, s), vel[2] + lhrandom(-s, s), 0, 0, 0, 0, 1, 0);
 		bloodcount -= r;
 	}
 }
 
 void CL_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count)
 {
-	float c;
 	float r;
+	float a;
 	vec3_t diff, center, velscale;
 	if (!cl_particles.integer) return;
 	if (!cl_particles_bloodshowers.integer) return;
@@ -535,8 +498,10 @@ void CL_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count)
 	velscale[1] = velspeed * 2.0 / diff[1];
 	velscale[2] = velspeed * 2.0 / diff[2];
 
-	c = count * 5;
-	while (c > 0)
+	bloodcount += count * 5.0f;
+	r = cl_particles_blood_size.value;
+	a = cl_particles_blood_alpha.value * 255;
+	while (bloodcount > 0)
 	{
 		vec3_t org, vel;
 		org[0] = lhrandom(mins[0], maxs[0]);
@@ -545,14 +510,14 @@ void CL_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count)
 		vel[0] = (org[0] - center[0]) * velscale[0];
 		vel[1] = (org[1] - center[1]) * velscale[1];
 		vel[2] = (org[2] - center[2]) * velscale[2];
-		r = lhrandom(cl_particles_blood_size_min.value, cl_particles_blood_size_max.value);
-		c -= r;
-		particle(pt_blood, PARTICLE_BILLBOARD, 0x300000, tex_smoke[rand()&7], true, false, r, r, cl_particles_blood_alpha.value * 255, 9999, -1, org[0], org[1], org[2], vel[0], vel[1], vel[2], 0, 0, 0, 0, 1, 0);
+		bloodcount -= r;
+		particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, r, r, a, a * 0.5, 9999, 0, -1, org[0], org[1], org[2], vel[0], vel[1], vel[2], 0, 0, 0, 0, 1, 0);
 	}
 }
 
 void CL_ParticleCube (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorbase, int gravity, int randomvel)
 {
+	int k;
 	float t;
 	if (!cl_particles.integer) return;
 	if (maxs[0] <= mins[0]) {t = mins[0];mins[0] = maxs[0];maxs[0] = t;}
@@ -560,13 +525,16 @@ void CL_ParticleCube (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color
 	if (maxs[2] <= mins[2]) {t = mins[2];mins[2] = maxs[2];maxs[2] = t;}
 
 	while (count--)
-		particle(gravity ? pt_grav : pt_static, PARTICLE_BILLBOARD, particlepalette[colorbase + (rand()&3)], tex_particle, false, false, 2, 2, 255, lhrandom(1, 2), 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), dir[0] + lhrandom(-randomvel, randomvel), dir[1] + lhrandom(-randomvel, randomvel), dir[2] + lhrandom(-randomvel, randomvel), 0, 0, 0, 0, 0, 0);
+	{
+		k = particlepalette[colorbase + (rand()&3)];
+		particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, false, 2, 2, 255, 0, lhrandom(1, 2), gravity ? 1 : 0, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), dir[0] + lhrandom(-randomvel, randomvel), dir[1] + lhrandom(-randomvel, randomvel), dir[2] + lhrandom(-randomvel, randomvel), 0, 0, 0, 0, 0, 0);
+	}
 }
 
 void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorbase, int type)
 {
-	vec3_t vel;
-	float t, z;
+	int k;
+	float t, z, minz, maxz;
 	if (!cl_particles.integer) return;
 	if (maxs[0] <= mins[0]) {t = mins[0];mins[0] = maxs[0];maxs[0] = t;}
 	if (maxs[1] <= mins[1]) {t = mins[1];mins[1] = maxs[1];maxs[1] = t;}
@@ -584,6 +552,11 @@ void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color
 	if (t < 0 || t > 2) // sanity check
 		t = 2;
 
+	minz = z - fabs(dir[2]) * 0.1;
+	maxz = z + fabs(dir[2]) * 0.1;
+	minz = bound(mins[2], minz, maxs[2]);
+	maxz = bound(mins[2], maxz, maxs[2]);
+
 	switch(type)
 	{
 	case 0:
@@ -591,19 +564,15 @@ void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color
 
 		while(count--)
 		{
-			vel[0] = dir[0] + lhrandom(-16, 16);
-			vel[1] = dir[1] + lhrandom(-16, 16);
-			vel[2] = dir[2] + lhrandom(-32, 32);
-			particle(pt_rain, PARTICLE_UPRIGHT_FACING, particlepalette[colorbase + (rand()&3)], tex_particle, true, true, 1, 64, 64, t, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), z, vel[0], vel[1], vel[2], 0, vel[0], vel[1], vel[2], 0, 0);
+			k = particlepalette[colorbase + (rand()&3)];
+			particle(pt_rain, PARTICLE_UPRIGHT_FACING, k, k, tex_particle, true, true, 0.5, 8, lhrandom(8, 16), 0, t, 0, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(minz, maxz), dir[0], dir[1], dir[2], cl.time + 9999, dir[0], dir[1], dir[2], 0, 0);
 		}
 		break;
 	case 1:
 		while(count--)
 		{
-			vel[0] = dir[0] + lhrandom(-16, 16);
-			vel[1] = dir[1] + lhrandom(-16, 16);
-			vel[2] = dir[2] + lhrandom(-32, 32);
-			particle(pt_snow, PARTICLE_BILLBOARD, particlepalette[colorbase + (rand()&3)], tex_particle, false, true, 2, 2, 255, t, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), z, vel[0], vel[1], vel[2], 0, vel[0], vel[1], vel[2], 0, 0);
+			k = particlepalette[colorbase + (rand()&3)];
+			particle(pt_rain, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 1, 1, lhrandom(64, 128), 0, t, 0, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(minz, maxz), dir[0], dir[1], dir[2], 0, dir[0], dir[1], dir[2], 0, 0);
 		}
 		break;
 	default:
@@ -611,8 +580,38 @@ void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color
 	}
 }
 
+void CL_Stardust (vec3_t mins, vec3_t maxs, int count)
+{
+	int k;
+	float t;
+	vec3_t o, v, center;
+	if (!cl_particles.integer) return;
+
+	if (maxs[0] <= mins[0]) {t = mins[0];mins[0] = maxs[0];maxs[0] = t;}
+	if (maxs[1] <= mins[1]) {t = mins[1];mins[1] = maxs[1];maxs[1] = t;}
+	if (maxs[2] <= mins[2]) {t = mins[2];mins[2] = maxs[2];maxs[2] = t;}
+
+	center[0] = (mins[0] + maxs[0]) * 0.5f;
+	center[1] = (mins[1] + maxs[1]) * 0.5f;
+	center[2] = (mins[2] + maxs[2]) * 0.5f;
+
+	while (count--)
+	{
+		k = particlepalette[224 + (rand()&15)];
+		o[0] = lhrandom(mins[0], maxs[0]);
+		o[1] = lhrandom(mins[1], maxs[1]);
+		o[2] = lhrandom(mins[2], maxs[2]);
+		VectorSubtract(o, center, v);
+		VectorNormalizeFast(v);
+		VectorScale(v, 100, v);
+		v[2] += sv_gravity.value * 0.15f;
+		particle(pt_static, PARTICLE_BILLBOARD, 0x903010, 0xFFD030, tex_particle, false, true, 1.5, 1.5, lhrandom(64, 128), 128, 9999, 1, 0, o[0], o[1], o[2], v[0], v[1], v[2], 0, 0, 0, 0, 0, 0);
+	}
+}
+
 void CL_FlameCube (vec3_t mins, vec3_t maxs, int count)
 {
+	int k;
 	float t;
 	if (!cl_particles.integer) return;
 	if (maxs[0] <= mins[0]) {t = mins[0];mins[0] = maxs[0];maxs[0] = t;}
@@ -620,15 +619,24 @@ void CL_FlameCube (vec3_t mins, vec3_t maxs, int count)
 	if (maxs[2] <= mins[2]) {t = mins[2];mins[2] = maxs[2];maxs[2] = t;}
 
 	while (count--)
-		particle(pt_flame, PARTICLE_BILLBOARD, particlepalette[224 + (rand()&15)], tex_particle, false, true, 8, 8, 255, 9999, 1.1, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), lhrandom(-32, 32), lhrandom(-32, 32), lhrandom(-32, 64), 0, 0, 0, 0, 1, 0);
+	{
+		k = particlepalette[224 + (rand()&15)];
+		particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 4, 4, lhrandom(64, 128), 384, 9999, -1, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), lhrandom(-32, 32), lhrandom(-32, 32), lhrandom(0, 64), 0, 0, 0, 0, 1, 0);
+		if (count & 1)
+			particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], false, true, 6, 6, lhrandom(48, 96), 64, 9999, 0, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(0, 32), 0, 0, 0, 0, 0, 0);
+	}
 }
 
 void CL_Flames (vec3_t org, vec3_t vel, int count)
 {
+	int k;
 	if (!cl_particles.integer) return;
 
 	while (count--)
-		particle(pt_flame, PARTICLE_BILLBOARD, particlepalette[224 + (rand()&15)], tex_particle, false, true, 8, 8, 255, 9999, 1.1, org[0], org[1], org[2], vel[0] + lhrandom(-128, 128), vel[1] + lhrandom(-128, 128), vel[2] + lhrandom(-128, 128), 0, 0, 0, 0, 1, 0);
+	{
+		k = particlepalette[224 + (rand()&15)];
+		particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 4, 4, lhrandom(64, 128), 384, 9999, -1, 1.1, org[0], org[1], org[2], vel[0] + lhrandom(-128, 128), vel[1] + lhrandom(-128, 128), vel[2] + lhrandom(-128, 128), 0, 0, 0, 0, 1, 0);
+	}
 }
 
 
@@ -641,7 +649,7 @@ CL_LavaSplash
 */
 void CL_LavaSplash (vec3_t origin)
 {
-	int			i, j;
+	int			i, j, k;
 	float		vel;
 	vec3_t		dir, org;
 	if (!cl_particles.integer) return;
@@ -657,7 +665,8 @@ void CL_LavaSplash (vec3_t origin)
 			org[1] = origin[1] + dir[1];
 			org[2] = origin[2] + lhrandom(0, 64);
 			vel = lhrandom(50, 120) / VectorLength(dir); // normalize and scale
-			particle(pt_lavasplash, PARTICLE_BILLBOARD, particlepalette[224 + (rand()&7)], tex_particle, false, true, 7, 7, 255, 9999, 0, org[0], org[1], org[2], dir[0] * vel, dir[1] * vel, dir[2] * vel, 0, 0, 0, 0, 0, 0);
+			k = particlepalette[224 + (rand()&7)];
+			particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 7, 7, 255, 192, 9999, 0.05, 0, org[0], org[1], org[2], dir[0] * vel, dir[1] * vel, dir[2] * vel, 0, 0, 0, 0, 0, 0);
 		}
 	}
 }
@@ -668,31 +677,28 @@ CL_TeleportSplash
 
 ===============
 */
+/*
 void CL_TeleportSplash (vec3_t org)
 {
-	int			i, j, k;
+	int i, j, k;
 	if (!cl_particles.integer) return;
 
 	for (i=-16 ; i<16 ; i+=8)
 		for (j=-16 ; j<16 ; j+=8)
 			for (k=-24 ; k<32 ; k+=8)
-				//particle(pt_fade, PARTICLE_BILLBOARD, 0xFFFFFF, tex_particle, false, true, 1.5, 1.5, lhrandom(64, 128), 9999, 0, org[0] + i + lhrandom(0, 8), org[1] + j + lhrandom(0, 8), org[2] + k + lhrandom(0, 8), i*2 + lhrandom(-12.5, 12.5), j*2 + lhrandom(-12.5, 12.5), k*2 + lhrandom(27.5, 52.5), 384.0f, 0, 0, 0, 1, 0);
-				particle(pt_fade, PARTICLE_BILLBOARD, 0xFFFFFF, tex_particle, false, true, 10, 10, lhrandom(64, 128), 9999, 0, org[0] + i + lhrandom(0, 8), org[1] + j + lhrandom(0, 8), org[2] + k + lhrandom(0, 8), lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-256, 256), 256.0f, 0, 0, 0, 1, 0);
+				particle(pt_static, PARTICLE_BILLBOARD, 0xA0A0A0, 0xFFFFFF, tex_particle, false, true, 10, 10, lhrandom(64, 128), 256, 9999, 0, 0, org[0] + i + lhrandom(0, 8), org[1] + j + lhrandom(0, 8), org[2] + k + lhrandom(0, 8), lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-256, 256), 0, 0, 0, 0, 1, 0);
 }
+*/
 
 void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
 {
-	vec3_t		vec, dir, vel, pos;
-	float		len, dec, speed;
-	int			contents, bubbles/*, c*/;
-	if (!cl_particles.integer) return;
+	vec3_t vec, dir, vel, pos;
+	float len, dec, speed, r;
+	int contents, smoke, blood, bubbles;
 
 	VectorSubtract(end, start, dir);
 	VectorNormalize(dir);
 
-	//if (type == 0 && host_frametime != 0) // rocket glow
-	//	particle(pt_oneframe, PARTICLE_BILLBOARD, 0xFFFFFF, tex_rocketglow, false, true, 24, 24, 255, 9999, 0, end[0] - 12 * dir[0], end[1] - 12 * dir[1], end[2] - 12 * dir[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
 	VectorSubtract (end, start, vec);
 	len = VectorNormalizeLength (vec);
 	dec = -ent->persistent.trail_time;
@@ -715,98 +721,77 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
 	if (contents == CONTENTS_SKY || contents == CONTENTS_LAVA)
 		return;
 
-	bubbles = (contents == CONTENTS_WATER || contents == CONTENTS_SLIME);
+	smoke = cl_particles.integer && cl_particles_smoke.integer;
+	blood = cl_particles.integer && cl_particles_blood.integer;
+	bubbles = cl_particles.integer && cl_particles_bubbles.integer && (contents == CONTENTS_WATER || contents == CONTENTS_SLIME);
 
 	while (len >= 0)
 	{
 		switch (type)
 		{
 			case 0:	// rocket trail
-				if (!cl_particles_smoke.integer)
-					return;
-				//dec = 5;
-				//particle(pt_fade, PARTICLE_BILLBOARD, 0x707070, tex_particle, true, false, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 256.0f, 0, 0, 0, 0, 0);
-				dec = 6;
-				particle(pt_fade, PARTICLE_BILLBOARD, 0x404040, tex_smoke[rand()&7], true, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-5, 5), lhrandom(-5, 5), lhrandom(-5, 5), 256.0f, 0, 0, 0, 0, 0);
-				//particle(pt_fade, PARTICLE_BILLBOARD, 0x707070, tex_smoke[rand()&7], false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-10, 10), lhrandom(-10, 10), lhrandom(-10, 10), 128.0f, 0, 0, 0, 0, 0);
-				//dec = 10;
-				//particle(pt_smoke, PARTICLE_BILLBOARD, 0x707070, tex_smoke[rand()&7], false, true, 2, 2, 160, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
-				if (bubbles && cl_particles_bubbles.integer)
+				dec = 3;
+				if (smoke)
 				{
-					particle(pt_bubble, PARTICLE_BILLBOARD, 0xFFFFFF, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, 0, 0);
-					//particle(pt_bubble, PARTICLE_BILLBOARD, 0xFFFFFF, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, 0, 0);
+					particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], false, true, dec, dec, 32, 64, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-5, 5), lhrandom(-5, 5), lhrandom(-5, 5), 0, 0, 0, 0, 0, 0);
+					particle(pt_static, PARTICLE_BILLBOARD, 0x801010, 0xFFA020, tex_smoke[rand()&7], false, true, dec, dec, 128, 768, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-20, 20), lhrandom(-20, 20), lhrandom(-20, 20), 0, 0, 0, 0, 0, 0);
 				}
-				else
+				if (bubbles)
 				{
-					//particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 2, 2, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 512.0f, 0, 0, 0, 1, 0);
-					//particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 2, 2, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 512.0f, 0, 0, 0, 1, 0);
-					//particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 1, 1, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64) - vel[0] * 0.0625, lhrandom(-64, 64) - vel[1] * 0.0625, lhrandom(-64, 64) - vel[2] * 0.0625, 512.0f, 0, 0, 0, 1, 0);
-					//particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 1, 1, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64) - vel[0] * 0.0625, lhrandom(-64, 64) - vel[1] * 0.0625, lhrandom(-64, 64) - vel[2] * 0.0625, 512.0f, 0, 0, 0, 1, 0);
-					//particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 1, 1, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64) - vel[0] * 0.0625, lhrandom(-64, 64) - vel[1] * 0.0625, lhrandom(-64, 64) - vel[2] * 0.0625, 512.0f, 0, 0, 0, 1, 0);
-					//particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 1, 1, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64) - vel[0] * 0.0625, lhrandom(-64, 64) - vel[1] * 0.0625, lhrandom(-64, 64) - vel[2] * 0.0625, 512.0f, 0, 0, 0, 1, 0);
+					r = lhrandom(1, 2);
+					particle(pt_bubble, PARTICLE_BILLBOARD, 0x404040, 0x808080, tex_bubble, false, true, r, r, lhrandom(64, 255), 256, 9999, -0.25, 1.5, pos[0], pos[1], pos[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, (1.0 / 16.0), 0);
 				}
 				break;
 
 			case 1: // grenade trail
 				// FIXME: make it gradually stop smoking
-				if (!cl_particles_smoke.integer)
-					return;
-				//dec = 5;
-				//particle(pt_fade, PARTICLE_BILLBOARD, 0x707070, tex_particle, true, false, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 256.0f, 0, 0, 0, 0, 0);
-				dec = 6;
-				particle(pt_fade, PARTICLE_BILLBOARD, 0x404040, tex_smoke[rand()&7], true, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-5, 5), lhrandom(-5, 5), lhrandom(-5, 5), 256.0f, 0, 0, 0, 0, 0);
-				//particle(pt_smoke, PARTICLE_BILLBOARD, 0x404040, tex_smoke[rand()&7], false, true, 2, 2, 160, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
-				if (bubbles && cl_particles_bubbles.integer)
+				dec = 3;
+				if (cl_particles.integer && cl_particles_smoke.integer)
 				{
-					particle(pt_bubble, PARTICLE_BILLBOARD, 0xFFFFFF, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, 0, 0);
-					//particle(pt_bubble, PARTICLE_BILLBOARD, 0xFFFFFF, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, 0, 0);
+					particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], false, true, dec, dec, 32, 96, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-5, 5), lhrandom(-5, 5), lhrandom(-5, 5), 0, 0, 0, 0, 0, 0);
 				}
 				break;
 
 
 			case 2:	// blood
-				if (!cl_particles_blood.integer)
-					return;
-				dec = lhrandom(cl_particles_blood_size_min.value, cl_particles_blood_size_max.value);
-				//particle(pt_blood, PARTICLE_BILLBOARD, 0x300000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, 9999, -1, pos[0], pos[1], pos[2], vel[0] + lhrandom(-64, 64), vel[1] + lhrandom(-64, 64), vel[2] + lhrandom(-64, 64), 0, 0, 0, 0, 1, 0);
-				particle(pt_blood, PARTICLE_BILLBOARD, 0x300000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, 9999, -1, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 0, 0, 0, 0, 1, 0);
-				//c = ((rand() & 15) + 16) << 16;
-				//particle(pt_blood, PARTICLE_BILLBOARD, c, tex_particle, true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, 9999, -1, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 0, 0, 0, 0, 1, 0);
-				break;
-
 			case 4:	// slight blood
-				if (!cl_particles_blood.integer)
-					return;
-				dec = lhrandom(cl_particles_blood_size_min.value, cl_particles_blood_size_max.value);
-				//particle(pt_blood, PARTICLE_BILLBOARD, 0x300000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 128.0f, 9999, -1, pos[0], pos[1], pos[2], vel[0] + lhrandom(-64, 64), vel[1] + lhrandom(-64, 64), vel[2] + lhrandom(-64, 64), 0, 0, 0, 0, 1, 0);
-				particle(pt_blood, PARTICLE_BILLBOARD, 0x300000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 128.0f, 9999, -1, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 0, 0, 0, 0, 1, 0);
-				//c = ((rand() & 15) + 16) << 16;
-				//particle(pt_blood, PARTICLE_BILLBOARD, c, tex_particle, true, false, dec, dec, cl_particles_blood_alpha.value * 128.0f, 9999, -1, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 0, 0, 0, 0, 1, 0);
+				dec = cl_particles_blood_size.value;
+				if (blood)
+				{
+					particle(pt_blood, PARTICLE_BILLBOARD, 0x100000, 0x280000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, cl_particles_blood_alpha.value * 255.0f * 0.5, 9999, 0, -1, pos[0], pos[1], pos[2], vel[0] * 0.5f + lhrandom(-64, 64), vel[1] * 0.5f + lhrandom(-64, 64), vel[2] * 0.5f + lhrandom(-64, 64), 0, 0, 0, 0, 1, 0);
+				}
 				break;
 
 			case 3:	// green tracer
 				dec = 6;
-				//particle(pt_fade, PARTICLE_BILLBOARD, 0x373707, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 384.0f, 0, 0, 0, 0, 0);
-				particle(pt_fade, PARTICLE_BILLBOARD, 0x373707, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0);
+				if (smoke)
+				{
+					particle(pt_static, PARTICLE_BILLBOARD, 0x002000, 0x003000, tex_particle, false, true, dec, dec, 128, 384, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 0, 0, 0, 0, 0, 0);
+				}
 				break;
 
 			case 5:	// flame tracer
 				dec = 6;
-				//particle(pt_fade, PARTICLE_BILLBOARD, 0xCF632B, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 384.0f, 0, 0, 0, 0, 0);
-				particle(pt_fade, PARTICLE_BILLBOARD, 0xCF632B, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0);
+				if (smoke)
+				{
+					particle(pt_static, PARTICLE_BILLBOARD, 0x301000, 0x502000, tex_particle, false, true, dec, dec, 128, 384, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 0, 0, 0, 0, 0, 0);
+				}
 				break;
 
 			case 6:	// voor trail
 				dec = 6;
-				//particle(pt_fade, PARTICLE_BILLBOARD, 0x47232B, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 384.0f, 0, 0, 0, 0, 0);
-				particle(pt_fade, PARTICLE_BILLBOARD, 0x47232B, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0);
+				if (smoke)
+				{
+					particle(pt_static, PARTICLE_BILLBOARD, 0x502030, 0x502030, tex_particle, false, true, dec, dec, 128, 384, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 0, 0, 0, 0, 0, 0);
+				}
 				break;
 
 			case 7:	// Nehahra smoke tracer
-				if (!cl_particles_smoke.integer)
-					return;
-				dec = 10;
-				particle(pt_smoke, PARTICLE_BILLBOARD, 0xC0C0C0, tex_smoke[rand()&7], true, false, dec, dec, 64, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
+				dec = 7;
+				if (smoke)
+				{
+					particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], true, false, dec, dec, 64, 320, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-4, 4), lhrandom(-4, 4), lhrandom(0, 16), 0, 0, 0, 0, 0, 0);
+				}
 				break;
 		}
 
@@ -819,8 +804,8 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
 
 void CL_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent)
 {
-	vec3_t		vec, pos;
-	int			len;
+	vec3_t vec, pos;
+	int len;
 	if (!cl_particles.integer) return;
 	if (!cl_particles_smoke.integer) return;
 
@@ -831,7 +816,7 @@ void CL_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent)
 	color = particlepalette[color];
 	while (len--)
 	{
-		particle(pt_smoke, PARTICLE_BILLBOARD, color, tex_particle, false, false, 5, 5, 128, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
+		particle(pt_static, PARTICLE_BILLBOARD, color, color, tex_particle, false, false, 5, 5, 128, 320, 9999, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
 		VectorAdd (pos, vec, pos);
 	}
 }
@@ -845,47 +830,37 @@ CL_MoveParticles
 void CL_MoveParticles (void)
 {
 	particle_t *p;
-	//renderparticle_t *r, *rend;
 	int i, activeparticles, maxparticle, j, a, pressureused = false, content;
-	float gravity, dvel, frametime, f, dist, normal[3], v[3], org[3];
+	float gravity, dvel, bloodwaterfade, frametime, f, dist, normal[3], v[3], org[3];
 
 	// LordHavoc: early out condition
 	if (!cl_numparticles)
-	{
-		//r_refdef.numparticles = 0;
 		return;
-	}
 
 	frametime = cl.time - cl.oldtime;
-	if (!frametime)
-		return; // if absolutely still, don't update particles
 	gravity = frametime * sv_gravity.value;
 	dvel = 1+4*frametime;
+	bloodwaterfade = max(cl_particles_blood_alpha.value, 0.01f) * frametime * 128.0f;
 
 	activeparticles = 0;
 	maxparticle = -1;
 	j = 0;
-	for (i = 0, p = particles/*, r = r_refdef.particles, rend = r + cl_maxparticles*/;i < cl_numparticles;i++, p++)
+	for (i = 0, p = particles;i < cl_numparticles;i++, p++)
 	{
-		if (p->die < cl.time)
-		{
-			freeparticles[j++] = p;
-			continue;
-		}
-
 		content = 0;
 		VectorCopy(p->org, p->oldorg);
 		VectorMA(p->org, frametime, p->vel, p->org);
 		VectorCopy(p->org, org);
 		if (p->bounce)
 		{
-			if (TraceLine(p->oldorg, p->org, v, normal, 0, true) < 1)
+			if (CL_TraceLine(p->oldorg, p->org, v, normal, 0, true) < 1)
 			{
 				VectorCopy(v, p->org);
 				if (p->bounce < 0)
 				{
 					// assume it's blood (lame, but...)
-					R_Stain(v, 48, 64, 24, 24, p->alpha * p->scalex * p->scaley * (1.0f / 2048.0f), 192, 48, 48, p->alpha * p->scalex * p->scaley * (1.0f / 2048.0f));
+					if (cl_stainmaps.integer)
+						R_Stain(v, 64, 32, 16, 16, p->alpha * p->scalex * (1.0f / 100.0f), 192, 48, 48, p->alpha * p->scalex * (1.0f / 100.0f));
 					p->die = -1;
 					freeparticles[j++] = p;
 					continue;
@@ -899,6 +874,8 @@ void CL_MoveParticles (void)
 				}
 			}
 		}
+		p->vel[2] -= p->gravity * gravity;
+		p->alpha -= p->alphafade * frametime;
 		if (p->friction)
 		{
 			f = p->friction * frametime;
@@ -910,276 +887,61 @@ void CL_MoveParticles (void)
 			VectorScale(p->vel, f, p->vel);
 		}
 
-		switch (p->type)
+		if (p->type != pt_static)
 		{
-		case pt_static:
-			break;
-
-			// LordHavoc: drop-through because of shared code
-		case pt_blob:
-			p->vel[2] *= dvel;
-		case pt_blob2:
-			p->vel[0] *= dvel;
-			p->vel[1] *= dvel;
-			p->alpha -= frametime * 256;
-			if (p->alpha < 1)
-				p->die = -1;
-			break;
-
-		case pt_grav:
-			p->vel[2] -= gravity;
-			break;
-		case pt_lavasplash:
-			p->vel[2] -= gravity * 0.05;
-			p->alpha -= frametime * 192;
-			if (p->alpha < 1)
-				p->die = -1;
-			break;
-		case pt_snow:
-			if (cl.time > p->time2)
+			switch (p->type)
 			{
-				p->time2 = cl.time + (rand() & 3) * 0.1;
-				p->vel[0] = (rand()&63)-32 + p->vel2[0];
-				p->vel[1] = (rand()&63)-32 + p->vel2[1];
-				p->vel[2] = (rand()&63)-32 + p->vel2[2];
-			}
-			if (!content)
-				content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
-			a = content;
-			if (a != CONTENTS_EMPTY && a != CONTENTS_SKY)
-			{
-				p->die = -1;
-				/*
-				if (a == CONTENTS_SOLID && Mod_PointInLeaf(p->oldorg, cl.worldmodel)->contents == CONTENTS_SOLID)
-					break; // still in solid
-				p->die = cl.time + 1000;
-				p->vel[0] = p->vel[1] = p->vel[2] = 0;
-				switch (a)
-				{
-				case CONTENTS_LAVA:
-				case CONTENTS_SLIME:
-					p->tex = tex_smoke[rand()&7];
-					p->orientation = PARTICLE_BILLBOARD;
-					p->type = pt_steam;
-					p->alpha = 96;
-					p->scalex = 5;
-					p->scaley = 5;
-					p->vel[2] = 96;
-					break;
-				case CONTENTS_WATER:
-					p->tex = tex_smoke[rand()&7];
-					p->orientation = PARTICLE_BILLBOARD;
-					p->type = pt_splash;
-					p->alpha = 96;
-					p->scalex = 5;
-					p->scaley = 5;
-					p->vel[2] = 96;
-					break;
-				default: // CONTENTS_SOLID and any others
-					TraceLine(p->oldorg, p->org, v, normal, 0, true);
-					VectorCopy(v, p->org);
-					p->tex = tex_smoke[rand()&7];
-					p->orientation = PARTICLE_BILLBOARD;
-					p->type = pt_fade;
-					p->time2 = 384.0f;
-					p->scalex = 5;
-					p->scaley = 5;
-					VectorClear(p->vel);
-					break;
-				}
-				*/
-			}
-			break;
-		case pt_blood:
-			p->friction = 1;
-			if (!content)
-				content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
-			a = content;
-			if (a != CONTENTS_EMPTY)
-			{
-				if (a == CONTENTS_WATER || a == CONTENTS_SLIME)
+			case pt_blood:
+				if (!content)
+					content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
+				a = content;
+				if (a != CONTENTS_EMPTY)
 				{
-					//p->friction = 5;
-					p->scalex += frametime * (cl_particles_blood_size_min.value + cl_particles_blood_size_max.value);
-					p->scaley += frametime * (cl_particles_blood_size_min.value + cl_particles_blood_size_max.value);
-					p->alpha -= frametime * max(cl_particles_blood_alpha.value, 0.01f) * 128.0f;
-					//p->vel[2] += gravity * 0.25f;
-					if (p->alpha < 1)
+					if (a == CONTENTS_WATER || a == CONTENTS_SLIME)
+					{
+						p->scalex += frametime * cl_particles_blood_size.value;
+						p->scaley += frametime * cl_particles_blood_size.value;
+						//p->alpha -= bloodwaterfade;
+					}
+					else
 						p->die = -1;
 				}
 				else
-					p->die = -1;
-			}
-			else
-				p->vel[2] -= gravity;
-			break;
-		case pt_spark:
-			p->alpha -= frametime * p->time2;
-			p->vel[2] -= gravity;
-			if (p->alpha < 1)
-				p->die = -1;
-			else
-			{
+					p->vel[2] -= gravity;
+				break;
+			case pt_bubble:
 				if (!content)
 					content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
-				if (content != CONTENTS_EMPTY)
-					p->die = -1;
-			}
-			break;
-		case pt_explosionsplash:
-			if (Mod_PointInLeaf(p->org, cl.worldmodel)->contents == CONTENTS_EMPTY)
-				p->vel[2] -= gravity;
-			else
-				p->alpha = 0;
-			p->scalex += frametime * 64.0f;
-			p->scaley += frametime * 64.0f;
-			p->alpha -= frametime * 1024.0f;
-			if (p->alpha < 1)
-				p->die = -1;
-			break;
-		case pt_fade:
-			p->alpha -= frametime * p->time2;
-			if (p->alpha < 1)
-				p->die = -1;
-			break;
-		case pt_bubble:
-			if (!content)
-				content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
-			if (content != CONTENTS_WATER && content != CONTENTS_SLIME)
-			{
-				p->tex = tex_smoke[rand()&7];
-				p->orientation = PARTICLE_BILLBOARD;
-				p->type = pt_splashpuff;
-				p->scalex = 4;
-				p->scaley = 4;
-				p->vel[0] = p->vel[1] = p->vel[2] = 0;
-				break;
-			}
-			p->vel[0] *= (1 - (frametime * 0.0625));
-			p->vel[1] *= (1 - (frametime * 0.0625));
-			p->vel[2] = (p->vel[2] + gravity * 0.25) * (1 - (frametime * 0.0625));
-			if (cl.time > p->time2)
-			{
-				p->time2 = cl.time + lhrandom(0, 0.5);
-				p->vel[0] += lhrandom(-32,32);
-				p->vel[1] += lhrandom(-32,32);
-				p->vel[2] += lhrandom(-32,32);
-			}
-			p->alpha -= frametime * 256;
-			if (p->alpha < 1)
-				p->die = -1;
-			break;
-		case pt_bulletsmoke:
-			p->scalex += frametime * 16;
-			p->scaley += frametime * 16;
-			p->alpha -= frametime * 1024;
-			p->vel[2] += gravity * 0.2;
-			if (p->alpha < 1)
-				p->die = -1;
-			break;
-		case pt_smoke:
-			p->scalex += frametime * 16;
-			p->scaley += frametime * 16;
-			p->alpha -= frametime * 320;
-			//p->vel[2] += gravity * 0.2;
-			if (p->alpha < 1)
-				p->die = -1;
-			break;
-		case pt_steam:
-			p->scalex += frametime * 48;
-			p->scaley += frametime * 48;
-			p->alpha -= frametime * 512;
-			p->vel[2] += gravity * 0.05;
-			if (p->alpha < 1)
-				p->die = -1;
-			break;
-		case pt_splashpuff:
-			p->alpha -= frametime * 1024;
-			if (p->alpha < 1)
-				p->die = -1;
-			break;
-		case pt_rain:
-			if (!content)
-				content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
-			a = content;
-			if (a != CONTENTS_EMPTY && a != CONTENTS_SKY)
-				p->die = -1;
-			/*
-			f = 0;
-			b = Mod_PointInLeaf(p->oldorg, cl.worldmodel)->contents;
-			VectorCopy(p->oldorg, o);
-			while (f < 1)
-			{
-				a = b;
-				f = TraceLine(o, p->org, v, normal, a, true);
-				b = traceline_endcontents;
-				if (f < 1 && b != CONTENTS_EMPTY && b != CONTENTS_SKY)
+				if (content != CONTENTS_WATER && content != CONTENTS_SLIME)
 				{
-					#if 1
 					p->die = -1;
-					#else
-					p->die = cl.time + 1000;
-					p->vel[0] = p->vel[1] = p->vel[2] = 0;
-					VectorCopy(v, p->org);
-					switch (b)
-					{
-					case CONTENTS_LAVA:
-					case CONTENTS_SLIME:
-						p->tex = tex_smoke[rand()&7];
-						p->orientation = PARTICLE_BILLBOARD;
-						p->type = pt_steam;
-						p->scalex = 3;
-						p->scaley = 3;
-						p->vel[2] = 96;
-						break;
-					default: // water, solid, and anything else
-						p->tex = tex_rainsplash[0];
-						p->orientation = PARTICLE_ORIENTED_DOUBLESIDED;
-						p->time2 = 0;
-						VectorCopy(normal, p->vel2);
-					//	VectorAdd(p->org, normal, p->org);
-						p->type = pt_raindropsplash;
-						p->scalex = 8;
-						p->scaley = 8;
-						break;
-					}
-					#endif
 					break;
 				}
-			}
-			*/
-			break;
-			/*
-		case pt_raindropsplash:
-			p->time2 += frametime * 64.0f;
-			if (p->time2 >= 16.0f)
-			{
+				break;
+			case pt_rain:
+				if (cl.time > p->time2)
+				{
+					// snow flutter
+					p->time2 = cl.time + (rand() & 3) * 0.1;
+					p->vel[0] = lhrandom(-32, 32) + p->vel2[0];
+					p->vel[1] = lhrandom(-32, 32) + p->vel2[1];
+					p->vel[2] = /*lhrandom(-32, 32) +*/ p->vel2[2];
+				}
+				if (!content)
+					content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
+				a = content;
+				if (a != CONTENTS_EMPTY && a != CONTENTS_SKY)
+					p->die = -1;
+				break;
+			default:
+				printf("unknown particle type %i\n", p->type);
 				p->die = -1;
 				break;
 			}
-			p->tex = tex_rainsplash[(int) p->time2];
-			p->orientation = PARTICLE_ORIENTED_DOUBLESIDED;
-			break;
-			*/
-		case pt_flame:
-			p->alpha -= frametime * 512;
-			p->vel[2] += gravity;
-			if (p->alpha < 16)
-				p->die = -1;
-			break;
-		case pt_oneframe:
-			if (p->time2)
-				p->die = -1;
-			p->time2 = 1;
-			break;
-		default:
-			printf("unknown particle type %i\n", p->type);
-			p->die = -1;
-			break;
 		}
 
-		// LordHavoc: immediate removal of unnecessary particles (must be done to ensure compactor below operates properly in all cases)
-		if (p->die < cl.time)
+		// remove dead particles
+		if (p->alpha < 1 || p->die < cl.time)
 			freeparticles[j++] = p;
 		else
 		{
@@ -1187,30 +949,8 @@ void CL_MoveParticles (void)
 			activeparticles++;
 			if (p->pressure)
 				pressureused = true;
-
-			/*
-			// build renderparticle for renderer to use
-			r->orientation = p->orientation;
-			r->additive = p->additive;
-			r->dir[0] = p->vel2[0];
-			r->dir[1] = p->vel2[1];
-			r->dir[2] = p->vel2[2];
-			r->org[0] = p->org[0];
-			r->org[1] = p->org[1];
-			r->org[2] = p->org[2];
-			r->tex = p->tex;
-			r->scalex = p->scalex * cl_particles_size.value;
-			r->scaley = p->scaley * cl_particles_size.value;
-			r->dynlight = p->dynlight;
-			r->color[0] = p->color[0] * (1.0f / 255.0f);
-			r->color[1] = p->color[1] * (1.0f / 255.0f);
-			r->color[2] = p->color[2] * (1.0f / 255.0f);
-			r->color[3] = p->alpha * (1.0f / 255.0f);
-			r++;
-			*/
 		}
 	}
-	//r_refdef.numparticles = r - r_refdef.particles;
 	// fill in gaps to compact the array
 	i = 0;
 	while (maxparticle >= activeparticles)
@@ -1243,8 +983,6 @@ void CL_MoveParticles (void)
 						{
 							dist = freeparticles[j]->scalex * 4.0f * frametime / sqrt(dist);
 							VectorMA(p->vel, dist, diff, p->vel);
-							//dist = freeparticles[j]->scalex * 4.0f * frametime / dist;
-							//VectorMA(p->vel, dist, freeparticles[j]->vel, p->vel);
 						}
 					}
 				}
@@ -1260,7 +998,7 @@ static rtexture_t *particlefonttexture;
 static particletexture_t particletexture[MAX_PARTICLETEXTURES][2];
 
 static cvar_t r_drawparticles = {0, "r_drawparticles", "1"};
-static cvar_t r_particles_lighting = {0, "r_particles_lighting", "1"};
+static cvar_t r_particles_lighting = {0, "r_particles_lighting", "0"};
 
 static qbyte shadebubble(float dx, float dy, vec3_t light)
 {
@@ -1332,13 +1070,12 @@ static void R_InitParticleTexture (void)
 				dy = y - 16;
 				for (x = 0;x < 32;x++)
 				{
-					d = (noise1[y][x] - 128) * 2 + 128;
-					d = bound(0, d, 255);
-					data[y][x][0] = data[y][x][1] = data[y][x][2] = d;
+					data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
 					dx = x - 16;
 					d = (noise2[y][x] - 128) * 3 + 192;
 					if (d > 0)
 				 		d = (d * (256 - (int) (dx*dx+dy*dy))) >> 8;
+					d = (d * noise1[y][x]) >> 7;
 					d = bound(0, d, 255);
 					data[y][x][3] = (qbyte) d;
 					if (m < d)
@@ -1349,10 +1086,7 @@ static void R_InitParticleTexture (void)
 		while (m < 224);
 
 		setuptex(i + 0, 0, i + 0, &data[0][0][0], particletexturedata);
-		for (y = 0;y < 32;y++)
-			for (x = 0;x < 32;x++)
-				data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
-		setuptex(i + 0, 1, i + 8, &data[0][0][0], particletexturedata);
+		setuptex(i + 0, 1, i + 0, &data[0][0][0], particletexturedata);
 	}
 
 	// rain splash
@@ -1420,26 +1154,6 @@ static void R_InitParticleTexture (void)
 	setuptex(26, 0, 34, &data[0][0][0], particletexturedata);
 	setuptex(26, 1, 34, &data[0][0][0], particletexturedata);
 
-	// rocket flare
-	for (y = 0;y < 32;y++)
-	{
-		dy = y - 16;
-		for (x = 0;x < 32;x++)
-		{
-			dx = x - 16;
-			d = (2048.0f / (dx*dx+dy*dy+1)) - 8.0f;
-			data[y][x][0] = bound(0, d * 1.0f, 255);
-			data[y][x][1] = bound(0, d * 0.8f, 255);
-			data[y][x][2] = bound(0, d * 0.5f, 255);
-			data[y][x][3] = bound(0, d * 1.0f, 255);
-		}
-	}
-	setuptex(27, 0, 35, &data[0][0][0], particletexturedata);
-	for (y = 0;y < 32;y++)
-		for (x = 0;x < 32;x++)
-			data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
-	setuptex(28, 1, 36, &data[0][0][0], particletexturedata);
-
 	particlefonttexture = R_LoadTexture (particletexturepool, "particlefont", 256, 256, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
 }
 
@@ -1469,8 +1183,7 @@ int partindexarray[6] = {0, 1, 2, 0, 2, 3};
 
 void R_DrawParticles (void)
 {
-	//renderparticle_t *r;
-	int i, lighting;
+	int i, lighting, dynlight, additive, texnum, orientation;
 	float minparticledist, org[3], uprightangles[3], up2[3], right2[3], v[3], right[3], up[3], tvxyz[4][4], tvst[4][2], fog, ifog, fogvec[3];
 	mleaf_t *leaf;
 	particletexture_t *tex, *texfog;
@@ -1478,7 +1191,6 @@ void R_DrawParticles (void)
 	particle_t *p;
 
 	// LordHavoc: early out conditions
-	//if ((!r_refdef.numparticles) || (!r_drawparticles.integer))
 	if ((!cl_numparticles) || (!r_drawparticles.integer))
 		return;
 
@@ -1486,7 +1198,7 @@ void R_DrawParticles (void)
 	if (!r_dynamic.integer)
 		lighting = 0;
 
-	c_particles += cl_numparticles; //r_refdef.numparticles;
+	c_particles += cl_numparticles;
 
 	uprightangles[0] = 0;
 	uprightangles[1] = r_refdef.viewangles[1];
@@ -1510,7 +1222,7 @@ void R_DrawParticles (void)
 	m.texcoords[0] = &tvst[0][0];
 	m.texcoordstep[0] = sizeof(float[2]);
 
-	for (i = 0/*, r = r_refdef.particles*/, p = particles;i < /*r_refdef.numparticles*/cl_numparticles;i++, p++)
+	for (i = 0, p = particles;i < cl_numparticles;i++, p++)
 	{
 		// LordHavoc: only render if not too close
 		if (DotProduct(p->org, vpn) < minparticledist)
@@ -1522,17 +1234,21 @@ void R_DrawParticles (void)
 			continue;
 
 		VectorCopy(p->org, org);
-		if (p->orientation == PARTICLE_BILLBOARD)
+		orientation = (p->flags >> P_ORIENTATION_FIRSTBIT) & ((1 << P_ORIENTATION_BITS) - 1);
+		texnum = (p->flags >> P_TEXNUM_FIRSTBIT) & ((1 << P_TEXNUM_BITS) - 1);
+		dynlight = p->flags & P_DYNLIGHT;
+		additive = p->flags & P_ADDITIVE;
+		if (orientation == PARTICLE_BILLBOARD)
 		{
 			VectorScale(vright, p->scalex, right);
 			VectorScale(vup, p->scaley, up);
 		}
-		else if (p->orientation == PARTICLE_UPRIGHT_FACING)
+		else if (orientation == PARTICLE_UPRIGHT_FACING)
 		{
 			VectorScale(right2, p->scalex, right);
 			VectorScale(up2, p->scaley, up);
 		}
-		else if (p->orientation == PARTICLE_ORIENTED_DOUBLESIDED)
+		else if (orientation == PARTICLE_ORIENTED_DOUBLESIDED)
 		{
 			// double-sided
 			if (DotProduct(p->vel2, r_origin) > DotProduct(p->vel2, org))
@@ -1546,13 +1262,13 @@ void R_DrawParticles (void)
 			VectorScale(up, p->scaley, up);
 		}
 		else
-			Host_Error("R_DrawParticles: unknown particle orientation %i\n", p->orientation);
+			Host_Error("R_DrawParticles: unknown particle orientation %i\n", orientation);
 
 		m.cr = p->color[0] * (1.0f / 255.0f);
 		m.cg = p->color[1] * (1.0f / 255.0f);
 		m.cb = p->color[2] * (1.0f / 255.0f);
 		m.ca = p->alpha * (1.0f / 255.0f);
-		if (lighting >= 1 && (p->dynlight || lighting >= 2))
+		if (lighting >= 1 && (dynlight || lighting >= 2))
 		{
 			R_CompleteLightPoint(v, org, true, leaf);
 			m.cr *= v[0];
@@ -1560,7 +1276,7 @@ void R_DrawParticles (void)
 			m.cb *= v[2];
 		}
 
-		tex = &particletexture[p->tex][0];
+		tex = &particletexture[texnum][0];
 
 		tvxyz[0][0] = org[0] - right[0] - up[0];
 		tvxyz[0][1] = org[1] - right[1] - up[1];
@@ -1583,13 +1299,13 @@ void R_DrawParticles (void)
 		tvst[3][0] = tex->s2;
 		tvst[3][1] = tex->t1;
 
-		if (p->additive)
+		if (additive)
 		{
 			m.blendfunc2 = GL_ONE;
 			fog = 0;
 			if (fogenabled)
 			{
-				texfog = &particletexture[p->tex][1];
+				texfog = &particletexture[texnum][1];
 				VectorSubtract(org, r_origin, fogvec);
 				ifog = 1 - exp(fogdensity/DotProduct(fogvec,fogvec));
 				if (ifog < (1.0f - (1.0f / 64.0f)))
@@ -1615,7 +1331,7 @@ void R_DrawParticles (void)
 			fog = 0;
 			if (fogenabled)
 			{
-				texfog = &particletexture[p->tex][1];
+				texfog = &particletexture[texnum][1];
 				VectorSubtract(org, r_origin, fogvec);
 				fog = exp(fogdensity/DotProduct(fogvec,fogvec));
 				if (fog >= (1.0f / 64.0f))
@@ -1680,3 +1396,4 @@ void R_DrawParticles (void)
 		}
 	}
 }
+