]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - cl_particles.c
optimizations to rendering
[xonotic/darkplaces.git] / cl_particles.c
index c00732e786ca0175da1933a6b492bc24224f56b3..c46bc83c0f8626d8a0f8bc894d0c3e064f30639a 100644 (file)
@@ -19,35 +19,44 @@ 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                     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
-       byte            color[4];
+       qbyte           color[4];
 }
 particle_t;
 
@@ -87,32 +96,30 @@ 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};
-static const int tex_bullethole[8] = {8, 9, 10, 11, 12, 13, 14, 15};
-static const int tex_rainsplash[16] = {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
-static const int tex_particle = 32;
-static const int tex_rain = 33;
-static const int tex_bubble = 34;
-static const int tex_rocketglow = 35;
+static const int tex_rainsplash[16] = {8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23};
+static const int tex_particle = 24;
+static const int tex_rain = 25;
+static const int tex_bubble = 26;
 
 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_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;
 
@@ -133,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)
@@ -148,53 +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);
+       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, 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->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);\
+       }\
 }
 
 /*
@@ -233,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, 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);
        }
 }
 
@@ -277,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, 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);
@@ -319,69 +347,20 @@ CL_ParticleExplosion
 */
 void CL_ParticleExplosion (vec3_t org, int smoke)
 {
-       int i, j;
-       float f;
-       vec3_t v, end, ang;
-       byte noise1[32*32], noise2[32*32];
+       int i;
+       if (cl_stainmaps.integer)
+               R_Stain(org, 96, 80, 80, 80, 64, 176, 176, 176, 64);
 
-       VectorClear(end); // hush MSVC
-       if (cl_particles.integer && cl_particles_explosions.integer)
+       i = Mod_PointInLeaf(org, cl.worldmodel)->contents;
+       if ((i == CONTENTS_SLIME || i == CONTENTS_WATER) && cl_particles.integer && cl_particles_bubbles.integer)
        {
-               i = Mod_PointInLeaf(org, cl.worldmodel)->contents;
-               if (i == CONTENTS_SLIME || i == CONTENTS_WATER)
+               for (i = 0;i < 128;i++)
                {
-                       for (i = 0;i < 128;i++)
-                               particle(pt_bubble, PARTICLE_BILLBOARD, 0xFFFFFF, tex_bubble, false, 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);
-
-                       ang[2] = lhrandom(0, 360);
-                       fractalnoise(noise1, 32, 4);
-                       fractalnoise(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);
-                                       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, 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, 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);
-                       fractalnoise(noise1, 32, 4);
-                       fractalnoise(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);
-                                       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, 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, 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, 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);
-                               }
-                       }
+                       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);
                }
        }
-       else
+
+       if (cl_explosions.integer)
                R_NewExplosion(org);
 }
 
@@ -393,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, 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), 0, 0, 0, 0, 0.1f, 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);
+       }
 }
 
 /*
@@ -408,13 +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, 64, 176, 176, 176, 64);
 
-       for (i = 0;i < 256;i++)
-               particle(pt_blob , PARTICLE_BILLBOARD, particlepalette[ 66+(rand()%6)], tex_particle, false, 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, 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);
 }
 
 /*
@@ -425,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, 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), 0, 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)
@@ -444,41 +428,62 @@ CL_SparkShower
 */
 void CL_SparkShower (vec3_t org, vec3_t dir, int count)
 {
+       int k;
        if (!cl_particles.integer) return;
 
-       CL_Decal(org, tex_bullethole[rand()&7], 16 * cl_particles_size.value, 0, 0, 0, 1);
+       if (cl_stainmaps.integer)
+               R_Stain(org, 32, 96, 96, 96, 2, 128, 128, 128, 2);
 
-       // smoke puff
-       if (cl_particles_smoke.integer)
-               particle(pt_bulletsmoke, PARTICLE_BILLBOARD, 0xA0A0A0, tex_smoke[rand()&7], true, 5, 5, 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_particles_sparks.integer)
+       if (cl_particles_bulletimpacts.integer)
        {
-               // sparks
-               while(count--)
-                       particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, 1, 1, lhrandom(0, 255), 9999, 1.5, org[0], org[1], org[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(0, 128), 512.0f, 0, 0, 0, 0.2f, 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_stainmaps.integer)
+               R_Stain(org, 48, 96, 96, 96, 3, 128, 128, 128, 3);
+}
+
+static float bloodcount = 0;
 void CL_BloodPuff (vec3_t org, vec3_t vel, int count)
 {
+       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;
 
-       if (count > 100)
-               count = 100;
+       s = count + 32.0f;
+       count *= 5.0f;
+       if (count > 1000)
+               count = 1000;
        bloodcount += count;
-       while(bloodcount >= 10)
+       r = cl_particles_blood_size.value;
+       a = cl_particles_blood_alpha.value * 255;
+       while(bloodcount > 0)
        {
-               particle(pt_blood, PARTICLE_BILLBOARD, 0x300000, tex_smoke[rand()&7], true, 24, 24, 255, 9999, -1, org[0], org[1], org[2], vel[0] + lhrandom(-64, 64), vel[1] + lhrandom(-64, 64), vel[2] + lhrandom(-64, 64), 0, 0, 0, 0, 1.0f, 0);
-               bloodcount -= 10;
+               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 r;
+       float a;
        vec3_t diff, center, velscale;
        if (!cl_particles.integer) return;
        if (!cl_particles_bloodshowers.integer) return;
@@ -493,7 +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];
 
-       while (count--)
+       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]);
@@ -502,26 +510,31 @@ 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];
-               particle(pt_blood, PARTICLE_BILLBOARD, 0x300000, tex_smoke[rand()&7], true, 24, 24, 255, 9999, -1, org[0], org[1], org[2], vel[0], vel[1], vel[2], 0, 0, 0, 0, 1.0f, 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)
 {
-       float           t;
+       int k;
+       float t;
        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;}
 
        while (count--)
-               particle(gravity ? pt_grav : pt_static, PARTICLE_BILLBOARD, particlepalette[colorbase + (rand()&3)], tex_particle, 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;}
@@ -539,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:
@@ -546,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, 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, 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:
@@ -566,24 +580,63 @@ 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)
 {
-       float           t;
+       int k;
+       float t;
        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;}
 
        while (count--)
-               particle(pt_flame, PARTICLE_BILLBOARD, particlepalette[224 + (rand()&15)], tex_particle, false, 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, 0.1f, 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, 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, 0.1f, 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);
+       }
 }
 
 
@@ -596,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;
@@ -612,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, 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);
                }
        }
 }
@@ -623,177 +677,147 @@ 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, 1, 1, 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), 0, 0, 0, 0, 0.1f, -512.0f);
+                               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;
-       float           len, dec = 0, speed;
-       int                     contents, bubbles;
-       double          t;
-       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, 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);
-
-       t = ent->persistent.trail_time;
-       if (t >= cl.time)
-               return; // no particles to spawn this frame (sparse trail)
-
-       if (t < cl.oldtime)
-               t = cl.oldtime;
-
        VectorSubtract (end, start, vec);
        len = VectorNormalizeLength (vec);
-       if (len <= 0.01f)
-       {
-               // advance the trail time
-               ent->persistent.trail_time = cl.time;
+       dec = -ent->persistent.trail_time;
+       ent->persistent.trail_time += len;
+       if (ent->persistent.trail_time < 0.01f)
                return;
-       }
-       speed = len / (cl.time - cl.oldtime);
-       VectorScale(vec, speed, vel);
+
+       speed = 1.0f / (ent->state_current.time - ent->state_previous.time);
+       VectorSubtract(ent->state_current.origin, ent->state_previous.origin, vel);
+       VectorScale(vel, speed, vel);
 
        // advance into this frame to reach the first puff location
-       dec = t - cl.oldtime;
-       dec *= speed;
-       VectorMA(start, dec, vec, start);
+       VectorMA(start, dec, vec, pos);
+       len -= dec;
+
+       // if we skip out, leave it reset
+       ent->persistent.trail_time = 0.0f;
 
-       contents = Mod_PointInLeaf(start, cl.worldmodel)->contents;
+       contents = Mod_PointInLeaf(pos, cl.worldmodel)->contents;
        if (contents == CONTENTS_SKY || contents == CONTENTS_LAVA)
-       {
-               // advance the trail time
-               ent->persistent.trail_time = cl.time;
                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 (t < cl.time)
+       while (len >= 0)
        {
                switch (type)
                {
                        case 0: // rocket trail
-                               if (!cl_particles_smoke.integer)
-                                       dec = cl.time - t;
-                               else if (bubbles && cl_particles_bubbles.integer)
+                               dec = 3;
+                               if (smoke)
                                {
-                                       dec = 0.005f;
-                                       particle(pt_bubble, PARTICLE_BILLBOARD, 0xFFFFFF, tex_bubble, false, 2, 2, 255, 9999, 1.5, start[0], start[1], start[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, 2, 2, 255, 9999, 1.5, start[0], start[1], start[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, 0, 0);
-                                       particle(pt_smoke, PARTICLE_BILLBOARD, 0xFFFFFF, tex_smoke[rand()&7], false, 2, 2, 160, 9999, 0, start[0], start[1], start[2], 0, 0, 0, 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)
                                {
-                                       dec = 0.005f;
-                                       particle(pt_smoke, PARTICLE_BILLBOARD, 0xC0C0C0, tex_smoke[rand()&7], true, 2, 2, 160, 9999, 0, start[0], start[1], start[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
-                                       //particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, 1, 1, lhrandom(128, 255), 9999, 1.5, start[0], start[1], start[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, 0.1f, 0);
-                                       //particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, 1, 1, lhrandom(128, 255), 9999, 1.5, start[0], start[1], start[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, 0.1f, 0);
-                                       //particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, 1, 1, lhrandom(128, 255), 9999, 1.5, start[0], start[1], start[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, 0.1f, 0);
-                                       //particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, 1, 1, lhrandom(128, 255), 9999, 1.5, start[0], start[1], start[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, 0.1f, 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)
-                                       dec = cl.time - t;
-                               else if (bubbles && cl_particles_bubbles.integer)
+                               dec = 3;
+                               if (cl_particles.integer && cl_particles_smoke.integer)
                                {
-                                       dec = 0.02f;
-                                       particle(pt_bubble, PARTICLE_BILLBOARD, 0xFFFFFF, tex_bubble, false, 2, 2, 255, 9999, 1.5, start[0], start[1], start[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, 2, 2, 255, 9999, 1.5, start[0], start[1], start[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, 0, 0);
-                                       particle(pt_smoke, PARTICLE_BILLBOARD, 0xFFFFFF, tex_smoke[rand()&7], false, 2, 2, 160, 9999, 0, start[0], start[1], start[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
-                               }
-                               else
-                               {
-                                       dec = 0.02f;
-                                       particle(pt_smoke, PARTICLE_BILLBOARD, 0x808080, tex_smoke[rand()&7], true, 2, 2, 160, 9999, 0, start[0], start[1], start[2], 0, 0, 0, 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)
-                                       dec = cl.time - t;
-                               else
-                               {
-                                       dec = 0.1f;
-                                       particle(pt_blood, PARTICLE_BILLBOARD, 0x300000, tex_smoke[rand()&7], true, 24, 24, 255, 9999, -1, start[0], start[1], start[2], vel[0] + lhrandom(-64, 64), vel[1] + lhrandom(-64, 64), vel[2] + lhrandom(-64, 64), 0, 0, 0, 0, 1.0f, 0);
-                               }
-                               break;
-
                        case 4: // slight blood
-                               if (!cl_particles_blood.integer)
-                                       dec = cl.time - t;
-                               else
+                               dec = cl_particles_blood_size.value;
+                               if (blood)
                                {
-                                       dec = 0.15f;
-                                       particle(pt_blood, PARTICLE_BILLBOARD, 0x300000, tex_smoke[rand()&7], true, 24, 24, 255, 9999, -1, start[0], start[1], start[2], vel[0] + lhrandom(-64, 64), vel[1] + lhrandom(-64, 64), vel[2] + lhrandom(-64, 64), 0, 0, 0, 0, 1.0f, 0);
+                                       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 = 0.02f;
-                               particle(pt_fade, PARTICLE_BILLBOARD, 0x373707, tex_smoke[rand()&7], false, 4, 4, 255, 9999, 0, start[0], start[1], start[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
+                               dec = 6;
+                               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 = 0.02f;
-                               particle(pt_fade, PARTICLE_BILLBOARD, 0xCF632B, tex_smoke[rand()&7], false, 4, 4, 255, 9999, 0, start[0], start[1], start[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
+                               dec = 6;
+                               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 = 0.05f; // sparse trail
-                               particle(pt_fade, PARTICLE_BILLBOARD, 0x47232B, tex_smoke[rand()&7], false, 4, 4, 255, 9999, 0, start[0], start[1], start[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
+                               dec = 6;
+                               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)
-                                       dec = cl.time - t;
-                               else
+                               dec = 7;
+                               if (smoke)
                                {
-                                       dec = 0.14f;
-                                       particle(pt_smoke, PARTICLE_BILLBOARD, 0xC0C0C0, tex_smoke[rand()&7], true, 10, 10, 64, 9999, 0, start[0], start[1], start[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
+                                       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;
                }
 
                // advance to next time and position
-               t += dec;
-               dec *= speed;
-               VectorMA (start, dec, vec, start);
+               len -= dec;
+               VectorMA (pos, dec, vec, pos);
        }
-       ent->persistent.trail_time = t;
+       ent->persistent.trail_time = len;
 }
 
 void CL_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent)
 {
-       vec3_t          vec;
-       int                     len;
+       vec3_t vec, pos;
+       int len;
        if (!cl_particles.integer) return;
        if (!cl_particles_smoke.integer) return;
 
+       VectorCopy(start, pos);
        VectorSubtract (end, start, vec);
        len = (int) (VectorNormalizeLength (vec) * (1.0f / 3.0f));
        VectorScale(vec, 3, vec);
        color = particlepalette[color];
        while (len--)
        {
-               particle(pt_smoke, PARTICLE_BILLBOARD, color, tex_particle, false, 8, 8, 192, 9999, 0, start[0], start[1], start[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
-               VectorAdd (start, vec, start);
+               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);
        }
 }
 
@@ -806,50 +830,37 @@ CL_MoveParticles
 void CL_MoveParticles (void)
 {
        particle_t *p;
-       renderparticle_t *r;
-       int i, activeparticles, maxparticle, j, a, b, pressureused = false;
-       float gravity, dvel, frametime, f, dist, normal[3], v[3], org[3], o[3];
+       int i, activeparticles, maxparticle, j, a, pressureused = false, content;
+       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;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);
-               if (p->friction)
-               {
-                       f = 1.0f - (p->friction * frametime);
-                       VectorScale(p->vel, f, p->vel);
-               }
                VectorCopy(p->org, org);
                if (p->bounce)
                {
-                       if (TraceLine(p->oldorg, p->org, v, normal, 0) < 1)
+                       if (CL_TraceLine(p->oldorg, p->org, v, normal, 0, true) < 1)
                        {
                                VectorCopy(v, p->org);
                                if (p->bounce < 0)
                                {
-                                       CL_Decal(v, p->tex, p->scalex * cl_particles_size.value, p->color[0] * (1.0f / 255.0f), p->color[1] * (1.0f / 255.0f), p->color[2] * (1.0f / 255.0f), p->alpha * (1.0f / 255.0f));
+                                       // assume it's blood (lame, but...)
+                                       if (cl_stainmaps.integer)
+                                               R_Stain(v, 32, 32, 16, 16, p->alpha * p->scalex * (1.0f / 400.0f), 192, 48, 48, p->alpha * p->scalex * (1.0f / 400.0f));
                                        p->die = -1;
                                        freeparticles[j++] = p;
                                        continue;
@@ -863,277 +874,74 @@ void CL_MoveParticles (void)
                                }
                        }
                }
-
-               switch (p->type)
+               p->vel[2] -= p->gravity * gravity;
+               p->alpha -= p->alphafade * frametime;
+               if (p->friction)
                {
-               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;
+                       f = p->friction * frametime;
+                       if (!content)
+                               content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
+                       if (content != CONTENTS_EMPTY)
+                               f *= 4;
+                       f = 1.0f - f;
+                       VectorScale(p->vel, f, p->vel);
+               }
 
-               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)
-                       {
-                               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];
-                       }
-                       a = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
-                       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);
-                                       VectorCopy(v, p->org);
-                                       p->tex = tex_smoke[rand()&7];
-                                       p->orientation = PARTICLE_BILLBOARD;
-                                       p->type = pt_fade;
-                                       p->scalex = 5;
-                                       p->scaley = 5;
-                                       VectorClear(p->vel);
-                                       break;
-                               }
-                               */
-                       }
-                       break;
-               case pt_blood:
-                       p->friction = 1;
-                       a = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
-                       if (a != CONTENTS_EMPTY)
+               if (p->type != pt_static)
+               {
+                       switch (p->type)
                        {
-                               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 * 32.0f;
-                                       p->scaley += frametime * 32.0f;
-                                       p->alpha -= frametime * 128.0f;
-                                       p->vel[2] += gravity * 0.125f;
-                                       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;
-                                       break;
                                }
                                else
+                                       p->vel[2] -= gravity;
+                               break;
+                       case pt_bubble:
+                               if (!content)
+                                       content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
+                               if (content != CONTENTS_WATER && content != CONTENTS_SLIME)
                                {
                                        p->die = -1;
                                        break;
                                }
-                       }
-                       p->vel[2] -= gravity * 0.5;
-                       break;
-               case pt_spark:
-                       p->alpha -= frametime * p->time2;
-                       p->vel[2] -= gravity;
-                       if (p->alpha < 1)
-                               p->die = -1;
-                       else if (Mod_PointInLeaf(p->org, cl.worldmodel)->contents != CONTENTS_EMPTY)
-                               p->type = pt_underwaterspark;
-                       break;
-               case pt_underwaterspark:
-                       if (Mod_PointInLeaf(p->org, cl.worldmodel)->contents == CONTENTS_EMPTY)
-                       {
-                               p->tex = tex_smoke[rand()&7];
-                               p->orientation = PARTICLE_BILLBOARD;
-                               p->color[0] = p->color[1] = p->color[2] = 255;
-                               p->scalex = 8;
-                               p->scaley = 8;
-                               p->type = pt_explosionsplash;
-                       }
-                       else
-                               p->vel[2] += gravity * 0.5f;
-                       p->alpha -= frametime * p->time2;
-                       if (p->alpha < 1)
-                               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 * 512;
-                       if (p->alpha < 1)
-                               p->die = -1;
-                       break;
-               case pt_bubble:
-                       a = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
-                       if (a != CONTENTS_WATER && a != 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[2] += gravity * 0.25;
-                       p->vel[0] *= (1 - (frametime * 0.0625));
-                       p->vel[1] *= (1 - (frametime * 0.0625));
-                       p->vel[2] *= (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.1;
-                       if (p->alpha < 1)
-                               p->die = -1;
-                       break;
-               case pt_smoke:
-                       p->scalex += frametime * 24;
-                       p->scaley += frametime * 24;
-                       p->alpha -= frametime * 256;
-                       p->vel[2] += gravity * 0.1;
-                       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:
-                       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);
-                               b = traceline_endcontents;
-                               if (f < 1 && b != CONTENTS_EMPTY && b != CONTENTS_SKY)
+                       case pt_rain:
+                               if (cl.time > p->time2)
                                {
-                                       p->die = -1;
-                                       /*
-                                       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;
-                                       }
-                                       */
+                                       // 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];
                                }
-                       }
-                       break;
-                       /*
-               case pt_raindropsplash:
-                       p->time2 += frametime * 64.0f;
-                       if (p->time2 >= 16.0f)
-                       {
+                               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
                {
@@ -1141,27 +949,8 @@ void CL_MoveParticles (void)
                        activeparticles++;
                        if (p->pressure)
                                pressureused = true;
-
-                       // build renderparticle for renderer to use
-                       r->orientation = p->orientation;
-                       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 * 0.5f * cl_particles_size.value;
-                       r->scaley = p->scaley * 0.5f * 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)
@@ -1194,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);
                                                }
                                        }
                                }
@@ -1203,3 +990,332 @@ void CL_MoveParticles (void)
                }
        }
 }
+
+#define MAX_PARTICLETEXTURES 64
+// particletexture_t is a rectangle in the particlefonttexture
+typedef struct
+{
+       float s1, t1, s2, t2;
+}
+particletexture_t;
+
+static rtexturepool_t *particletexturepool;
+
+static rtexture_t *particlefonttexture;
+static particletexture_t particletexture[MAX_PARTICLETEXTURES];
+
+static cvar_t r_drawparticles = {0, "r_drawparticles", "1"};
+
+static qbyte shadebubble(float dx, float dy, vec3_t light)
+{
+       float   dz, f, dot;
+       vec3_t  normal;
+       dz = 1 - (dx*dx+dy*dy);
+       if (dz > 0) // it does hit the sphere
+       {
+               f = 0;
+               // back side
+               normal[0] = dx;normal[1] = dy;normal[2] = dz;
+               VectorNormalize(normal);
+               dot = DotProduct(normal, light);
+               if (dot > 0.5) // interior reflection
+                       f += ((dot *  2) - 1);
+               else if (dot < -0.5) // exterior reflection
+                       f += ((dot * -2) - 1);
+               // front side
+               normal[0] = dx;normal[1] = dy;normal[2] = -dz;
+               VectorNormalize(normal);
+               dot = DotProduct(normal, light);
+               if (dot > 0.5) // interior reflection
+                       f += ((dot *  2) - 1);
+               else if (dot < -0.5) // exterior reflection
+                       f += ((dot * -2) - 1);
+               f *= 128;
+               f += 16; // just to give it a haze so you can see the outline
+               f = bound(0, f, 255);
+               return (qbyte) f;
+       }
+       else
+               return 0;
+}
+
+static void setuptex(int cltexnum, int rtexnum, qbyte *data, qbyte *particletexturedata)
+{
+       int basex, basey, y;
+       basex = ((rtexnum >> 0) & 7) * 32;
+       basey = ((rtexnum >> 3) & 7) * 32;
+       particletexture[cltexnum].s1 = (basex + 1) / 256.0f;
+       particletexture[cltexnum].t1 = (basey + 1) / 256.0f;
+       particletexture[cltexnum].s2 = (basex + 31) / 256.0f;
+       particletexture[cltexnum].t2 = (basey + 31) / 256.0f;
+       for (y = 0;y < 32;y++)
+               memcpy(particletexturedata + ((basey + y) * 256 + basex) * 4, data + y * 32 * 4, 32 * 4);
+}
+
+static void R_InitParticleTexture (void)
+{
+       int             x,y,d,i,m;
+       float   dx, dy, radius, f, f2;
+       qbyte   data[32][32][4], noise1[64][64], noise2[64][64];
+       vec3_t  light;
+       qbyte   particletexturedata[256*256*4];
+
+       memset(particletexturedata, 255, sizeof(particletexturedata));
+
+       // the particletexture[][] array numbers must match the cl_part.c textures
+       // smoke/blood
+       for (i = 0;i < 8;i++)
+       {
+               do
+               {
+                       fractalnoise(&noise1[0][0], 64, 4);
+                       fractalnoise(&noise2[0][0], 64, 8);
+                       m = 0;
+                       for (y = 0;y < 32;y++)
+                       {
+                               dy = y - 16;
+                               for (x = 0;x < 32;x++)
+                               {
+                                       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)
+                                               m = d;
+                               }
+                       }
+               }
+               while (m < 224);
+
+               setuptex(i + 0, i + 0, &data[0][0][0], particletexturedata);
+       }
+
+       // rain splash
+       for (i = 0;i < 16;i++)
+       {
+               radius = i * 3.0f / 16.0f;
+               f2 = 255.0f * ((15.0f - i) / 15.0f);
+               for (y = 0;y < 32;y++)
+               {
+                       dy = (y - 16) * 0.25f;
+                       for (x = 0;x < 32;x++)
+                       {
+                               dx = (x - 16) * 0.25f;
+                               data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
+                               f = (1.0 - fabs(radius - sqrt(dx*dx+dy*dy))) * f2;
+                               f = bound(0.0f, f, 255.0f);
+                               data[y][x][3] = (int) f;
+                       }
+               }
+               setuptex(i + 8, i + 16, &data[0][0][0], particletexturedata);
+       }
+
+       // normal particle
+       for (y = 0;y < 32;y++)
+       {
+               dy = y - 16;
+               for (x = 0;x < 32;x++)
+               {
+                       data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
+                       dx = x - 16;
+                       d = (256 - (dx*dx+dy*dy));
+                       d = bound(0, d, 255);
+                       data[y][x][3] = (qbyte) d;
+               }
+       }
+       setuptex(24, 32, &data[0][0][0], particletexturedata);
+
+       // rain
+       light[0] = 1;light[1] = 1;light[2] = 1;
+       VectorNormalize(light);
+       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;
+                       data[y][x][3] = shadebubble((x - 16) * (1.0 / 8.0), y < 24 ? (y - 24) * (1.0 / 24.0) : (y - 24) * (1.0 / 8.0), light);
+               }
+       }
+       setuptex(25, 33, &data[0][0][0], particletexturedata);
+
+       // bubble
+       light[0] = 1;light[1] = 1;light[2] = 1;
+       VectorNormalize(light);
+       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;
+                       data[y][x][3] = shadebubble((x - 16) * (1.0 / 16.0), (y - 16) * (1.0 / 16.0), light);
+               }
+       }
+       setuptex(26, 34, &data[0][0][0], particletexturedata);
+
+       particlefonttexture = R_LoadTexture (particletexturepool, "particlefont", 256, 256, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
+}
+
+static void r_part_start(void)
+{
+       particletexturepool = R_AllocTexturePool();
+       R_InitParticleTexture ();
+}
+
+static void r_part_shutdown(void)
+{
+       R_FreeTexturePool(&particletexturepool);
+}
+
+static void r_part_newmap(void)
+{
+}
+
+void R_Particles_Init (void)
+{
+       Cvar_RegisterVariable(&r_drawparticles);
+       R_RegisterModule("R_Particles", r_part_start, r_part_shutdown, r_part_newmap);
+}
+
+int partindexarray[6] = {0, 1, 2, 0, 2, 3};
+
+void R_DrawParticleCallback(const void *calldata1, int calldata2)
+{
+       int additive, texnum, orientation;
+       float org[3], up2[3], right2[3], v[3], right[3], up[3], fog, ifog, fogvec[3], cr, cg, cb, ca;
+       particletexture_t *tex;
+       rmeshbufferinfo_t m;
+       const particle_t *p = calldata1;
+
+       VectorCopy(p->org, org);
+       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;
+
+       memset(&m, 0, sizeof(m));
+       m.blendfunc1 = GL_SRC_ALPHA;
+       if (additive)
+               m.blendfunc2 = GL_ONE;
+       else
+               m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+       m.numtriangles = 2;
+       m.numverts = 4;
+       m.tex[0] = R_GetTexture(particlefonttexture);
+       Matrix4x4_CreateIdentity(&m.matrix);
+       if (R_Mesh_Draw_GetBuffer(&m, false))
+       {
+               m.index[0] = 0;
+               m.index[1] = 1;
+               m.index[2] = 2;
+               m.index[3] = 0;
+               m.index[4] = 2;
+               m.index[5] = 3;
+               if (orientation == PARTICLE_BILLBOARD)
+               {
+                       VectorScale(vright, p->scalex, right);
+                       VectorScale(vup, p->scaley, up);
+               }
+               else if (orientation == PARTICLE_UPRIGHT_FACING)
+               {
+                       v[0] = r_origin[0] - org[0];
+                       v[1] = r_origin[1] - org[1];
+                       v[2] = 0;
+                       VectorNormalizeFast(v);
+                       VectorVectors(v, right2, up2);
+                       VectorScale(right2, p->scalex, right);
+                       VectorScale(up2, p->scaley, up);
+               }
+               else if (orientation == PARTICLE_ORIENTED_DOUBLESIDED)
+               {
+                       // double-sided
+                       if (DotProduct(p->vel2, r_origin) > DotProduct(p->vel2, org))
+                       {
+                               VectorNegate(p->vel2, v);
+                               VectorVectors(v, right, up);
+                       }
+                       else
+                               VectorVectors(p->vel2, right, up);
+                       VectorScale(right, p->scalex, right);
+                       VectorScale(up, p->scaley, up);
+               }
+               else
+                       Host_Error("R_DrawParticles: unknown particle orientation %i\n", orientation);
+               m.vertex[0] = org[0] - right[0] - up[0];
+               m.vertex[1] = org[1] - right[1] - up[1];
+               m.vertex[2] = org[2] - right[2] - up[2];
+               m.vertex[4] = org[0] - right[0] + up[0];
+               m.vertex[5] = org[1] - right[1] + up[1];
+               m.vertex[6] = org[2] - right[2] + up[2];
+               m.vertex[8] = org[0] + right[0] + up[0];
+               m.vertex[9] = org[1] + right[1] + up[1];
+               m.vertex[10] = org[2] + right[2] + up[2];
+               m.vertex[12] = org[0] + right[0] - up[0];
+               m.vertex[13] = org[1] + right[1] - up[1];
+               m.vertex[14] = org[2] + right[2] - up[2];
+               tex = &particletexture[texnum];
+               m.texcoords[0][0] = tex->s1;
+               m.texcoords[0][1] = tex->t1;
+               m.texcoords[0][2] = tex->s1;
+               m.texcoords[0][3] = tex->t2;
+               m.texcoords[0][4] = tex->s2;
+               m.texcoords[0][5] = tex->t2;
+               m.texcoords[0][6] = tex->s2;
+               m.texcoords[0][7] = tex->t1;
+               cr = p->color[0] * (1.0f / 255.0f);
+               cg = p->color[1] * (1.0f / 255.0f);
+               cb = p->color[2] * (1.0f / 255.0f);
+               ca = p->alpha * (1.0f / 255.0f);
+               if (fogenabled)
+               {
+                       VectorSubtract(org, r_origin, fogvec);
+                       fog = exp(fogdensity/DotProduct(fogvec,fogvec));
+                       ifog = 1 - fog;
+                       cr = cr * ifog;
+                       cg = cg * ifog;
+                       cb = cb * ifog;
+                       if (!additive)
+                       {
+                               cr += fogcolor[0] * fog;
+                               cg += fogcolor[1] * fog;
+                               cb += fogcolor[2] * fog;
+                       }
+               }
+               m.color[0] = m.color[4] = m.color[8] = m.color[12] = cr * m.colorscale;
+               m.color[1] = m.color[5] = m.color[9] = m.color[13] = cg * m.colorscale;
+               m.color[2] = m.color[6] = m.color[10] = m.color[14] = cb * m.colorscale;
+               m.color[3] = m.color[7] = m.color[11] = m.color[15] = ca;
+               R_Mesh_Render();
+       }
+}
+
+void R_DrawParticles (void)
+{
+       int i;
+       float minparticledist;
+       particle_t *p;
+
+       // LordHavoc: early out conditions
+       if ((!cl_numparticles) || (!r_drawparticles.integer))
+               return;
+
+       c_particles += cl_numparticles;
+
+       minparticledist = DotProduct(r_origin, vpn) + 16.0f;
+
+       for (i = 0, p = particles;i < cl_numparticles;i++, p++)
+       {
+               // LordHavoc: only render if not too close
+               if (DotProduct(p->org, vpn) < minparticledist)
+                       continue;
+
+               // LordHavoc: check if it's in a visible leaf
+               //if (Mod_PointInLeaf(p->org, cl.worldmodel)->visframe != r_framecount)
+               //      continue;
+
+               R_MeshQueue_AddTransparent(p->org, R_DrawParticleCallback, p, 0);
+       }
+}
+