]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - cl_particles.c
another bugfix for WORKINGLQUAKE code
[xonotic/darkplaces.git] / cl_particles.c
index ba62bcecff480426f80e6b5961297d29ab477bbf..4a8263d002e38f6122eb2933208e4556123a7bb2 100644 (file)
@@ -19,29 +19,187 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+
+#ifdef WORKINGLQUAKE
+#define lhrandom(MIN,MAX) ((rand() & 32767) * (((MAX)-(MIN)) * (1.0f / 32767.0f)) + (MIN))
+#define NUMVERTEXNORMALS       162
+siextern float r_avertexnormals[NUMVERTEXNORMALS][3];
+#define m_bytenormals r_avertexnormals
+#define VectorNormalizeFast VectorNormalize
+#define Mod_PointContents(v,m) (Mod_PointInLeaf(v,m)->contents)
+typedef unsigned char qbyte;
+#define cl_stainmaps.integer 0
+void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2)
+{
+}
+#define CL_EntityParticles R_EntityParticles
+#define CL_ReadPointFile_f R_ReadPointFile_f
+#define CL_ParseParticleEffect R_ParseParticleEffect
+#define CL_ParticleExplosion R_ParticleExplosion
+#define CL_ParticleExplosion2 R_ParticleExplosion2
+#define CL_BlobExplosion R_BlobExplosion
+#define CL_RunParticleEffect R_RunParticleEffect
+#define CL_LavaSplash R_LavaSplash
+#define CL_RocketTrail2 R_RocketTrail2
+void R_CalcBeamVerts (float *vert, vec3_t org1, vec3_t org2, float width)
+{
+       vec3_t right1, right2, diff, normal;
+
+       VectorSubtract (org2, org1, normal);
+       VectorNormalizeFast (normal);
+
+       // calculate 'right' vector for start
+       VectorSubtract (r_origin, org1, diff);
+       VectorNormalizeFast (diff);
+       CrossProduct (normal, diff, right1);
+
+       // calculate 'right' vector for end
+       VectorSubtract (r_origin, org2, diff);
+       VectorNormalizeFast (diff);
+       CrossProduct (normal, diff, right2);
+
+       vert[ 0] = org1[0] + width * right1[0];
+       vert[ 1] = org1[1] + width * right1[1];
+       vert[ 2] = org1[2] + width * right1[2];
+       vert[ 4] = org1[0] - width * right1[0];
+       vert[ 5] = org1[1] - width * right1[1];
+       vert[ 6] = org1[2] - width * right1[2];
+       vert[ 8] = org2[0] - width * right2[0];
+       vert[ 9] = org2[1] - width * right2[1];
+       vert[10] = org2[2] - width * right2[2];
+       vert[12] = org2[0] + width * right2[0];
+       vert[13] = org2[1] + width * right2[1];
+       vert[14] = org2[2] + width * right2[2];
+}
+void fractalnoise(qbyte *noise, int size, int startgrid)
+{
+       int x, y, g, g2, amplitude, min, max, size1 = size - 1, sizepower, gridpower;
+       int *noisebuf;
+#define n(x,y) noisebuf[((y)&size1)*size+((x)&size1)]
+
+       for (sizepower = 0;(1 << sizepower) < size;sizepower++);
+       if (size != (1 << sizepower))
+               Sys_Error("fractalnoise: size must be power of 2\n");
+
+       for (gridpower = 0;(1 << gridpower) < startgrid;gridpower++);
+       if (startgrid != (1 << gridpower))
+               Sys_Error("fractalnoise: grid must be power of 2\n");
+
+       startgrid = bound(0, startgrid, size);
+
+       amplitude = 0xFFFF; // this gets halved before use
+       noisebuf = malloc(size*size*sizeof(int));
+       memset(noisebuf, 0, size*size*sizeof(int));
+
+       for (g2 = startgrid;g2;g2 >>= 1)
+       {
+               // brownian motion (at every smaller level there is random behavior)
+               amplitude >>= 1;
+               for (y = 0;y < size;y += g2)
+                       for (x = 0;x < size;x += g2)
+                               n(x,y) += (rand()&amplitude);
+
+               g = g2 >> 1;
+               if (g)
+               {
+                       // subdivide, diamond-square algorithm (really this has little to do with squares)
+                       // diamond
+                       for (y = 0;y < size;y += g2)
+                               for (x = 0;x < size;x += g2)
+                                       n(x+g,y+g) = (n(x,y) + n(x+g2,y) + n(x,y+g2) + n(x+g2,y+g2)) >> 2;
+                       // square
+                       for (y = 0;y < size;y += g2)
+                               for (x = 0;x < size;x += g2)
+                               {
+                                       n(x+g,y) = (n(x,y) + n(x+g2,y) + n(x+g,y-g) + n(x+g,y+g)) >> 2;
+                                       n(x,y+g) = (n(x,y) + n(x,y+g2) + n(x-g,y+g) + n(x+g,y+g)) >> 2;
+                               }
+               }
+       }
+       // find range of noise values
+       min = max = 0;
+       for (y = 0;y < size;y++)
+               for (x = 0;x < size;x++)
+               {
+                       if (n(x,y) < min) min = n(x,y);
+                       if (n(x,y) > max) max = n(x,y);
+               }
+       max -= min;
+       max++;
+       // normalize noise and copy to output
+       for (y = 0;y < size;y++)
+               for (x = 0;x < size;x++)
+                       *noise++ = (qbyte) (((n(x,y) - min) * 256) / max);
+       free(noisebuf);
+#undef n
+}
+void VectorVectors(const vec3_t forward, vec3_t right, vec3_t up)
+{
+       float d;
+
+       right[0] = forward[2];
+       right[1] = -forward[0];
+       right[2] = forward[1];
+
+       d = DotProduct(forward, right);
+       right[0] -= d * forward[0];
+       right[1] -= d * forward[1];
+       right[2] -= d * forward[2];
+       VectorNormalizeFast(right);
+       CrossProduct(right, forward, up);
+}
+#if QW
+#include "pmove.h"
+extern qboolean PM_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, pmtrace_t *trace);
+#endif
+float CL_TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int contents, int hitbmodels, void **hitent)
+{
+#if QW
+       pmtrace_t trace;
+#else
+       trace_t trace;
+#endif
+       memset (&trace, 0, sizeof(trace));
+       trace.fraction = 1;
+       VectorCopy (end, trace.endpos);
+#if QW
+       PM_RecursiveHullCheck (cl.model_precache[1]->hulls, 0, 0, 1, start, end, &trace);
+#else
+       RecursiveHullCheck (cl.worldmodel->hulls, 0, 0, 1, start, end, &trace);
+#endif
+       VectorCopy(trace.endpos, impact);
+       VectorCopy(trace.plane.normal, normal);
+       return trace.fraction;
+}
+#else
 #include "cl_collision.h"
+#endif
 
-#define MAX_PARTICLES                  16384   // default max # of particles at one time
+#define MAX_PARTICLES                  32768   // 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_rain, pt_bubble, pt_blood
+       pt_static, pt_rain, pt_bubble, pt_blood, pt_grow, pt_decal
 }
 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))
+#define PARTICLE_INVALID 0
+#define PARTICLE_BILLBOARD 1
+#define PARTICLE_SPARK 2
+#define PARTICLE_ORIENTED_DOUBLESIDED 3
+#define PARTICLE_BEAM 4
+
+#define PBLEND_ALPHA 0
+#define PBLEND_ADD 1
+#define PBLEND_MOD 2
 
 typedef struct particle_s
 {
        ptype_t         type;
-       unsigned int    flags; // dynamically lit, orientation, additive blending, texnum
+       int                     orientation;
+       int                     texnum;
+       int                     blendmode;
        vec3_t          org;
        vec3_t          vel;
        float           die;
@@ -98,12 +256,14 @@ static int particlepalette[256] =
 
 //static int explosparkramp[8] = {0x4b0700, 0x6f0f00, 0x931f07, 0xb7330f, 0xcf632b, 0xe3974f, 0xffe7b5, 0xffffff};
 
-// these must match r_part.c's textures
+// texture numbers in particle font
 static const int tex_smoke[8] = {0, 1, 2, 3, 4, 5, 6, 7};
 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_raindrop = 25;
 static const int tex_bubble = 26;
+static const int tex_beam = 27;
+static const int tex_blooddecal[8] = {32, 33, 34, 35, 36, 37, 38, 39};
 
 static int                     cl_maxparticles;
 static int                     cl_numparticles;
@@ -120,8 +280,13 @@ 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"};
+cvar_t cl_decals = {CVAR_SAVE, "cl_decals", "0"};
+cvar_t cl_decals_time = {CVAR_SAVE, "cl_decals_time", "0"};
+cvar_t cl_decals_fadetime = {CVAR_SAVE, "cl_decals_fadetime", "20"};
 
+#ifndef WORKINGLQUAKE
 static mempool_t *cl_part_mempool;
+#endif
 
 void CL_Particles_Clear(void)
 {
@@ -161,48 +326,51 @@ void CL_Particles_Init (void)
        Cvar_RegisterVariable (&cl_particles_smoke);
        Cvar_RegisterVariable (&cl_particles_sparks);
        Cvar_RegisterVariable (&cl_particles_bubbles);
-
+       Cvar_RegisterVariable (&cl_decals);
+       Cvar_RegisterVariable (&cl_decals_time);
+       Cvar_RegisterVariable (&cl_decals_fadetime);
+
+#ifdef WORKINGLQUAKE
+       particles = (particle_t *) Hunk_AllocName(cl_maxparticles * sizeof(particle_t), "particles");
+       freeparticles = (void *) Hunk_AllocName(cl_maxparticles * sizeof(particle_t *), "particles");
+#else
        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 *));
+#endif
        cl_numparticles = 0;
 }
 
-#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)\
+#define particle(ptype, porientation, pcolor1, pcolor2, ptex, plight, pblendmode, pscalex, pscaley, palpha, palphafade, ptime, pgravity, pbounce, px, py, pz, pvx, pvy, pvz, ptime2, pvx2, pvy2, pvz2, pfriction, ppressure)\
 {\
-       if (cl_numparticles >= cl_maxparticles)\
-               return;\
+       if (cl_numparticles < cl_maxparticles)\
        {\
                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)\
+               int ptempcolor, ptempcolor2, pcr1, pcg1, pcb1, pcr2, pcg2, pcb2;\
+               ptempcolor = (pcolor1);\
+               ptempcolor2 = (pcolor2);\
+               pcr2 = ((ptempcolor2) >> 16) & 0xFF;\
+               pcg2 = ((ptempcolor2) >> 8) & 0xFF;\
+               pcb2 = (ptempcolor2) & 0xFF;\
+               if (ptempcolor != ptempcolor2)\
                {\
-                       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;\
+                       pcr1 = ((ptempcolor) >> 16) & 0xFF;\
+                       pcg1 = ((ptempcolor) >> 8) & 0xFF;\
+                       pcb1 = (ptempcolor) & 0xFF;\
+                       ptempcolor = rand() & 0xFF;\
+                       pcr2 = (((pcr2 - pcr1) * ptempcolor) >> 8) + pcr1;\
+                       pcg2 = (((pcg2 - pcg1) * ptempcolor) >> 8) + pcg1;\
+                       pcb2 = (((pcb2 - pcb1) * ptempcolor) >> 8) + pcb1;\
                }\
                part = &particles[cl_numparticles++];\
                part->type = (ptype);\
-               part->color[0] = cr2;\
-               part->color[1] = cg2;\
-               part->color[2] = cb2;\
+               part->color[0] = pcr2;\
+               part->color[1] = pcg2;\
+               part->color[2] = pcb2;\
                part->color[3] = 0xFF;\
-               part->flags = partflags;\
+               part->orientation = porientation;\
+               part->texnum = ptex;\
+               part->blendmode = pblendmode;\
                part->scalex = (pscalex);\
                part->scaley = (pscaley);\
                part->alpha = (palpha);\
@@ -261,7 +429,11 @@ void CL_EntityParticles (entity_t *ent)
                forward[1] = cp*sy;
                forward[2] = -sp;
 
-               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);
+#ifdef WORKINGLQUAKE
+               particle(pt_static, PARTICLE_BILLBOARD, particlepalette[0x6f], particlepalette[0x6f], tex_particle, false, PBLEND_ALPHA, 2, 2, 255, 0, 0, 0, 0, ent->origin[0] + m_bytenormals[i][0]*dist + forward[0]*beamlength, ent->origin[1] + m_bytenormals[i][1]*dist + forward[1]*beamlength, ent->origin[2] + m_bytenormals[i][2]*dist + forward[2]*beamlength, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+#else
+               particle(pt_static, PARTICLE_BILLBOARD, particlepalette[0x6f], particlepalette[0x6f], tex_particle, false, PBLEND_ALPHA, 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);
+#endif
        }
 }
 
@@ -270,16 +442,33 @@ void CL_ReadPointFile_f (void)
 {
        vec3_t  org;
        int             r, c;
-       char    *pointfile, *pointfilepos, *t, tchar;
-
-       pointfile = COM_LoadFile(va("maps/%s.pts", sv.name), true);
+       char    *pointfile = NULL, *pointfilepos, *t, tchar;
+#if WORKINGLQUAKE
+       char    name[MAX_OSPATH];
+       
+       sprintf (name,"maps/%s.pts", cl.worldmodel->name);
+       COM_FOpenFile (name, &f);
+       if (f)
+       {
+               int pointfilelength;
+               fseek(f, 0, SEEK_END);
+               pointfilelength = ftell(f);
+               fseek(f, 0, SEEK_SET);
+               pointfile = malloc(pointfilelength + 1);
+               fread(pointfile, 1, pointfilelength, f);
+               pointfile[pointfilelength] = 0;
+               fclose(f);
+       }
+#else
+       pointfile = COM_LoadFile(va("maps/%s.pts", cl.worldmodel->name), true);
+#endif
        if (!pointfile)
        {
-               Con_Printf ("couldn't open %s.pts\n", sv.name);
+               Con_Printf ("couldn't open %s.pts\n", cl.worldmodel->name);
                return;
        }
 
-       Con_Printf ("Reading %s.pts...\n", sv.name);
+       Con_Printf ("Reading %s.pts...\n", cl.worldmodel->name);
        c = 0;
        pointfilepos = pointfile;
        while (*pointfilepos)
@@ -305,10 +494,14 @@ void CL_ReadPointFile_f (void)
                        Con_Printf ("Not enough free particles\n");
                        break;
                }
-               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);
+               particle(pt_static, PARTICLE_BILLBOARD, particlepalette[(-c)&15], particlepalette[(-c)&15], tex_particle, false, PBLEND_ALPHA, 2, 2, 255, 0, 99999, 0, 0, org[0], org[1], org[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
        }
 
+#ifdef WORKINGLQUAKE
+       free(pointfile);
+#else
        Mem_Free(pointfile);
+#endif
        Con_Printf ("%i points read\n", c);
 }
 
@@ -321,8 +514,8 @@ Parse an effect out of the server message
 */
 void CL_ParseParticleEffect (void)
 {
-       vec3_t          org, dir;
-       int                     i, count, msgcount, color;
+       vec3_t org, dir;
+       int i, count, msgcount, color;
 
        for (i=0 ; i<3 ; i++)
                org[i] = MSG_ReadCoord ();
@@ -345,18 +538,60 @@ CL_ParticleExplosion
 
 ===============
 */
-void CL_ParticleExplosion (vec3_t org, int smoke)
+void CL_ParticleExplosion (vec3_t org)
 {
-       int i;
+       int i, k;
+       //vec3_t v;
+       //vec3_t v2;
        if (cl_stainmaps.integer)
-               R_Stain(org, 96, 80, 80, 80, 128, 176, 176, 176, 128);
+               R_Stain(org, 96, 80, 80, 80, 64, 176, 176, 176, 64);
 
-       i = Mod_PointInLeaf(org, cl.worldmodel)->contents;
+       i = Mod_PointContents(org, cl.worldmodel);
        if ((i == CONTENTS_SLIME || i == CONTENTS_WATER) && cl_particles.integer && cl_particles_bubbles.integer)
        {
                for (i = 0;i < 128;i++)
                {
-                       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);
+                       particle(pt_bubble, PARTICLE_BILLBOARD, 0x404040, 0x808080, tex_bubble, false, PBLEND_ADD, 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
+       {
+               /*
+               // LordHavoc: smoke effect similar to UT2003, chews fillrate too badly up close
+               // smoke puff
+               if (cl_particles_smoke.integer)
+               {
+                       for (i = 0;i < 64;i++)
+                       {
+#ifdef WORKINGLQUAKE
+                               v2[0] = lhrandom(-64, 64);
+                               v2[1] = lhrandom(-64, 64);
+                               v2[2] = lhrandom(-8, 24);
+#else
+                               for (k = 0;k < 16;k++)
+                               {
+                                       v[0] = org[0] + lhrandom(-64, 64);
+                                       v[1] = org[1] + lhrandom(-64, 64);
+                                       v[2] = org[2] + lhrandom(-8, 24);
+                                       if (CL_TraceLine(org, v, v2, NULL, 0, true, NULL) >= 0.1)
+                                               break;
+                               }
+                               VectorSubtract(v2, org, v2);
+#endif
+                               VectorScale(v2, 2.0f, v2);
+                               particle(pt_static, PARTICLE_BILLBOARD, 0x101010, 0x202020, tex_smoke[rand()&7], true, PBLEND_ADD, 12, 12, 255, 512, 9999, 0, 0, org[0], org[1], org[2], v2[0], v2[1], v2[2], 0, 0, 0, 0, 0, 0);
+                       }
+               }
+               */
+
+               if (cl_particles_sparks.integer)
+               {
+                       // sparks
+                       for (i = 0;i < 256;i++)
+                       {
+                               k = particlepalette[0x68 + (rand() & 7)];
+                               particle(pt_static, PARTICLE_SPARK, k, k, tex_particle, false, PBLEND_ADD, 1.5f, 0.05f, lhrandom(0, 255), 512, 9999, 1, 0, org[0], org[1], org[2], lhrandom(-192, 192), lhrandom(-192, 192), lhrandom(-192, 192) + 160, 0, 0, 0, 0, 0, 0);
+                       }
                }
        }
 
@@ -378,7 +613,7 @@ void CL_ParticleExplosion2 (vec3_t org, int colorStart, int colorLength)
        for (i = 0;i < 512;i++)
        {
                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);
+               particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, PBLEND_ALPHA, 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);
        }
 }
 
@@ -391,7 +626,7 @@ CL_BlobExplosion
 void CL_BlobExplosion (vec3_t org)
 {
        if (cl_stainmaps.integer)
-               R_Stain(org, 96, 80, 80, 80, 128, 176, 176, 176, 128);
+               R_Stain(org, 96, 80, 80, 80, 64, 176, 176, 176, 64);
 
        if (cl_explosions.integer)
                R_NewExplosion(org);
@@ -409,14 +644,14 @@ void CL_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count)
 
        if (count == 1024)
        {
-               CL_ParticleExplosion(org, false);
+               CL_ParticleExplosion(org);
                return;
        }
        if (!cl_particles.integer) return;
        while (count--)
        {
                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);
+               particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, PBLEND_ALPHA, 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);
        }
 }
 
@@ -432,13 +667,19 @@ void CL_SparkShower (vec3_t org, vec3_t dir, int count)
        if (!cl_particles.integer) return;
 
        if (cl_stainmaps.integer)
-               R_Stain(org, 32, 96, 96, 96, 32, 128, 128, 128, 32);
+               R_Stain(org, 32, 96, 96, 96, 24, 128, 128, 128, 24);
 
        if (cl_particles_bulletimpacts.integer)
        {
                // 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);
+               {
+                       k = count / 4;
+                       while(k--)
+                       {
+                               particle(pt_grow, PARTICLE_BILLBOARD, 0x101010, 0x202020, tex_smoke[rand()&7], true, PBLEND_ADD, 3, 3, 255, 1024, 9999, -0.2, 0, org[0] + 0.125f * lhrandom(-count, count), org[1] + 0.125f * lhrandom (-count, count), org[2] + 0.125f * lhrandom(-count, count), lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(0, 16), 15, 0, 0, 0, 0, 0);
+                       }
+               }
 
                if (cl_particles_sparks.integer)
                {
@@ -446,7 +687,7 @@ void CL_SparkShower (vec3_t org, vec3_t dir, int count)
                        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);
+                               particle(pt_static, PARTICLE_SPARK, k, k, tex_particle, false, PBLEND_ADD, 0.4f, 0.015f, 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);
                        }
                }
        }
@@ -455,7 +696,7 @@ void CL_SparkShower (vec3_t org, vec3_t dir, int count)
 void CL_PlasmaBurn (vec3_t org)
 {
        if (cl_stainmaps.integer)
-               R_Stain(org, 48, 96, 96, 96, 48, 128, 128, 128, 48);
+               R_Stain(org, 48, 96, 96, 96, 32, 128, 128, 128, 32);
 }
 
 static float bloodcount = 0;
@@ -475,7 +716,8 @@ void CL_BloodPuff (vec3_t org, vec3_t vel, int count)
        a = cl_particles_blood_alpha.value * 255;
        while(bloodcount > 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);
+               particle(pt_blood, PARTICLE_BILLBOARD, 0xFFFFFF, 0xFFFFFF, tex_blooddecal[rand()&7], true, PBLEND_MOD, r, r, a * 3, a * 1.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);
+               //particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, PBLEND_ALPHA, 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;
        }
 }
@@ -511,7 +753,8 @@ void CL_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count)
                vel[1] = (org[1] - center[1]) * velscale[1];
                vel[2] = (org[2] - center[2]) * velscale[2];
                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);
+               particle(pt_blood, PARTICLE_BILLBOARD, 0xFFFFFF, 0xFFFFFF, tex_blooddecal[rand()&7], true, PBLEND_MOD, r, r, a * 3, a * 1.5, 9999, 0, -1, org[0], org[1], org[2], vel[0], vel[1], vel[2], 0, 0, 0, 0, 1, 0);
+               //particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, PBLEND_ALPHA, 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);
        }
 }
 
@@ -527,7 +770,7 @@ void CL_ParticleCube (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color
        while (count--)
        {
                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);
+               particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, PBLEND_ALPHA, 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);
        }
 }
 
@@ -565,14 +808,14 @@ void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color
                while(count--)
                {
                        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);
+                       particle(pt_rain, PARTICLE_SPARK, k, k, tex_particle, true, PBLEND_ADD, 0.5, 0.02, 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--)
                {
                        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);
+                       particle(pt_rain, PARTICLE_BILLBOARD, k, k, tex_particle, false, PBLEND_ADD, 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:
@@ -605,7 +848,7 @@ void CL_Stardust (vec3_t mins, vec3_t maxs, int count)
                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);
+               particle(pt_static, PARTICLE_BILLBOARD, 0x903010, 0xFFD030, tex_particle, false, PBLEND_ADD, 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);
        }
 }
 
@@ -621,9 +864,9 @@ void CL_FlameCube (vec3_t mins, vec3_t maxs, int count)
        while (count--)
        {
                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);
+               particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, PBLEND_ADD, 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);
+                       particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], false, PBLEND_ADD, 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);
        }
 }
 
@@ -635,7 +878,7 @@ void CL_Flames (vec3_t org, vec3_t vel, int count)
        while (count--)
        {
                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);
+               particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, PBLEND_ADD, 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);
        }
 }
 
@@ -666,7 +909,7 @@ void CL_LavaSplash (vec3_t origin)
                        org[2] = origin[2] + lhrandom(0, 64);
                        vel = lhrandom(50, 120) / VectorLength(dir); // normalize and scale
                        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);
+                       particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, PBLEND_ADD, 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);
                }
        }
 }
@@ -677,8 +920,8 @@ CL_TeleportSplash
 
 ===============
 */
-/*
-void CL_TeleportSplash (vec3_t org)
+#if WORKINGLQUAKE
+void R_TeleportSplash (vec3_t org)
 {
        int i, j, k;
        if (!cl_particles.integer) return;
@@ -686,11 +929,15 @@ void CL_TeleportSplash (vec3_t org)
        for (i=-16 ; i<16 ; i+=8)
                for (j=-16 ; j<16 ; j+=8)
                        for (k=-24 ; k<32 ; k+=8)
-                               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);
+                               particle(pt_static, PARTICLE_BILLBOARD, 0xA0A0A0, 0xFFFFFF, tex_particle, false, PBLEND_ADD, 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);
 }
-*/
+#endif
 
+#ifdef WORKINGLQUAKE
+void R_RocketTrail (vec3_t start, vec3_t end, int type)
+#else
 void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
+#endif
 {
        vec3_t vec, dir, vel, pos;
        float len, dec, speed, r;
@@ -700,24 +947,31 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
        VectorNormalize(dir);
 
        VectorSubtract (end, start, vec);
+#ifdef WORKINGLQUAKE
+       len = VectorNormalize (vec);
+       dec = 0;
+       speed = 1.0f / cl.frametime;
+       VectorSubtract(end, start, vel);
+#else
        len = VectorNormalizeLength (vec);
        dec = -ent->persistent.trail_time;
        ent->persistent.trail_time += len;
        if (ent->persistent.trail_time < 0.01f)
                return;
 
+       // if we skip out, leave it reset
+       ent->persistent.trail_time = 0.0f;
+
        speed = 1.0f / (ent->state_current.time - ent->state_previous.time);
        VectorSubtract(ent->state_current.origin, ent->state_previous.origin, vel);
+#endif
        VectorScale(vel, speed, vel);
 
        // advance into this frame to reach the first puff location
        VectorMA(start, dec, vec, pos);
        len -= dec;
 
-       // if we skip out, leave it reset
-       ent->persistent.trail_time = 0.0f;
-
-       contents = Mod_PointInLeaf(pos, cl.worldmodel)->contents;
+       contents = Mod_PointContents(pos, cl.worldmodel);
        if (contents == CONTENTS_SKY || contents == CONTENTS_LAVA)
                return;
 
@@ -733,13 +987,13 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                                dec = 3;
                                if (smoke)
                                {
-                                       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);
+                                       particle(pt_grow,   PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], false, PBLEND_ADD, dec, dec, 32, 64, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-5, 5), lhrandom(-5, 5), lhrandom(-5, 5), 6, 0, 0, 0, 0, 0);
+                                       particle(pt_static, PARTICLE_BILLBOARD, 0x801010, 0xFFA020, tex_smoke[rand()&7], false, PBLEND_ADD, 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);
                                }
                                if (bubbles)
                                {
                                        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);
+                                       particle(pt_bubble, PARTICLE_BILLBOARD, 0x404040, 0x808080, tex_bubble, false, PBLEND_ADD, 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;
 
@@ -748,7 +1002,7 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                                dec = 3;
                                if (cl_particles.integer && cl_particles_smoke.integer)
                                {
-                                       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);
+                                       particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], false, PBLEND_ADD, 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;
 
@@ -758,7 +1012,8 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                                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);
+                                       particle(pt_blood, PARTICLE_BILLBOARD, 0xFFFFFF, 0xFFFFFF, tex_blooddecal[rand()&7], true, PBLEND_MOD, dec, dec, cl_particles_blood_alpha.value * 255.0f * 3.0f, cl_particles_blood_alpha.value * 255.0f * 0.5f * 1.5f, 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);
+                                       //particle(pt_blood, PARTICLE_BILLBOARD, 0x100000, 0x280000, tex_smoke[rand()&7], true, PBLEND_ALPHA, 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;
 
@@ -766,7 +1021,7 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                                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);
+                                       particle(pt_static, PARTICLE_BILLBOARD, 0x002000, 0x003000, tex_particle, false, PBLEND_ADD, 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;
 
@@ -774,7 +1029,7 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                                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);
+                                       particle(pt_static, PARTICLE_BILLBOARD, 0x301000, 0x502000, tex_particle, false, PBLEND_ADD, 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;
 
@@ -782,7 +1037,7 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                                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);
+                                       particle(pt_static, PARTICLE_BILLBOARD, 0x502030, 0x502030, tex_particle, false, PBLEND_ADD, 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;
 
@@ -790,16 +1045,25 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                                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);
+                                       particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], true, PBLEND_ALPHA, 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;
+                       case 8: // Nexiuz plasma trail
+                               dec = 4;
+                               if (smoke)
+                               {
+                                       //particle(pt_static, PARTICLE_BILLBOARD, 0x2030FF, 0x80C0FF, tex_particle, false, PBLEND_ADD, 3.0f, 3.0f, lhrandom(64, 255), 512, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-32, 32) + dir[0] * -64.0f, lhrandom(-32, 32) + dir[1] * -64.0f, lhrandom(-32, 32) + dir[2] * -64.0f, 0, 0, 0, 0, 0, 0);
+                                       particle(pt_static, PARTICLE_BILLBOARD, 0x283880, 0x283880, tex_particle, false, PBLEND_ADD, dec, dec, 255, 1024, 9999, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
+                               }
                }
 
                // advance to next time and position
                len -= dec;
                VectorMA (pos, dec, vec, pos);
        }
+#ifndef WORKINGLQUAKE
        ent->persistent.trail_time = len;
+#endif
 }
 
 void CL_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent)
@@ -811,16 +1075,73 @@ void CL_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent)
 
        VectorCopy(start, pos);
        VectorSubtract (end, start, vec);
+#ifdef WORKINGLQUAKE
+       len = (int) (VectorNormalize (vec) * (1.0f / 3.0f));
+#else
        len = (int) (VectorNormalizeLength (vec) * (1.0f / 3.0f));
+#endif
        VectorScale(vec, 3, vec);
        color = particlepalette[color];
        while (len--)
        {
-               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);
+               particle(pt_static, PARTICLE_BILLBOARD, color, color, tex_particle, false, PBLEND_ALPHA, 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);
        }
 }
 
+void CL_BeamParticle (const vec3_t start, const vec3_t end, vec_t radius, float red, float green, float blue, float alpha, float lifetime)
+{
+       int tempcolor2, cr, cg, cb;
+       cr = red * 255;
+       cg = green * 255;
+       cb = blue * 255;
+       tempcolor2 = (bound(0, cr, 255) << 16) | (bound(0, cg, 255) << 8) | bound(0, cb, 255);
+       particle(pt_static, PARTICLE_BEAM, tempcolor2, tempcolor2, tex_beam, false, PBLEND_ADD, radius, radius, alpha * 255, alpha * 255 / lifetime, 9999, 0, 0, start[0], start[1], start[2], 0, 0, 0, 0, end[0], end[1], end[2], 0, 0);
+}
+
+void CL_Tei_Smoke(const vec3_t org, const vec3_t dir, int count)
+{
+       int k;
+       if (!cl_particles.integer) return;
+
+       // smoke puff
+       if (cl_particles_smoke.integer)
+       {
+               k = count / 4;
+               while(k--)
+               {
+                       particle(pt_grow, PARTICLE_BILLBOARD, 0x202020, 0x404040, tex_smoke[rand()&7], true, PBLEND_ADD, 5, 5, 255, 512, 9999, 0, 0, org[0] + 0.125f * lhrandom(-count, count), org[1] + 0.125f * lhrandom (-count, count), org[2] + 0.125f * lhrandom(-count, count), dir[0] + lhrandom(-count, count) * 0.5f, dir[1] + lhrandom(-count, count) * 0.5f, dir[2] + lhrandom(-count, count) * 0.5f, 15, 0, 0, 0, 0, 0);
+               }
+       }
+}
+
+void CL_Tei_PlasmaHit(const vec3_t org, const vec3_t dir, int count)
+{
+       int k;
+       if (!cl_particles.integer) return;
+
+       if (cl_stainmaps.integer)
+               R_Stain(org, 40, 96, 96, 96, 40, 128, 128, 128, 40);
+
+       // smoke puff
+       if (cl_particles_smoke.integer)
+       {
+               k = count / 4;
+               while(k--)
+               {
+                       particle(pt_grow, PARTICLE_BILLBOARD, 0x202020, 0x404040, tex_smoke[rand()&7], true, PBLEND_ADD, 5, 5, 255, 512, 9999, 0, 0, org[0] + 0.125f * lhrandom(-count, count), org[1] + 0.125f * lhrandom (-count, count), org[2] + 0.125f * lhrandom(-count, count), dir[0] + lhrandom(-count, count), dir[1] + lhrandom(-count, count), dir[2] + lhrandom(-count, count), 15, 0, 0, 0, 0, 0);
+               }
+       }
+
+       if (cl_particles_sparks.integer)
+       {
+               // sparks
+               while(count--)
+               {
+                       particle(pt_static, PARTICLE_SPARK, 0x2030FF, 0x80C0FF, tex_particle, false, PBLEND_ADD, 2.0f, 0.1f, lhrandom(64, 255), 512, 9999, 0, 0, org[0], org[1], org[2], lhrandom(-count, count) * 3.0f + dir[0], lhrandom(-count, count) * 3.0f + dir[1], lhrandom(-count, count) * 3.0f + dir[2], 0, 0, 0, 0, 0, 0);
+               }
+       }
+}
 
 /*
 ===============
@@ -837,7 +1158,11 @@ void CL_MoveParticles (void)
        if (!cl_numparticles)
                return;
 
+#ifdef WORKINGLQUAKE
+       frametime = cl.frametime;
+#else
        frametime = cl.time - cl.oldtime;
+#endif
        gravity = frametime * sv_gravity.value;
        dvel = 1+4*frametime;
        bloodwaterfade = max(cl_particles_blood_alpha.value, 0.01f) * frametime * 128.0f;
@@ -853,17 +1178,38 @@ void CL_MoveParticles (void)
                VectorCopy(p->org, org);
                if (p->bounce)
                {
-                       if (CL_TraceLine(p->oldorg, p->org, v, normal, 0, true) < 1)
+                       if (CL_TraceLine(p->oldorg, p->org, v, normal, 0, true, NULL) < 1)
                        {
                                VectorCopy(v, p->org);
                                if (p->bounce < 0)
                                {
                                        // assume it's blood (lame, but...)
+#ifndef WORKINGLQUAKE
                                        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;
+                                               R_Stain(v, 32, 32, 16, 16, p->alpha * p->scalex * (1.0f / 40.0f), 192, 48, 48, p->alpha * p->scalex * (1.0f / 40.0f));
+#endif
+                                       if (cl_decals.integer)
+                                       {
+                                               p->type = pt_decal;
+                                               p->orientation = PARTICLE_ORIENTED_DOUBLESIDED;
+                                               p->time2 = cl.time + cl_decals_time.value;
+                                               p->die = p->time2 + cl_decals_fadetime.value;
+                                               p->alphafade = 0;
+                                               VectorCopy(normal, p->vel2);
+                                               VectorClear(p->vel);
+                                               VectorAdd(p->org, normal, p->org);
+                                               p->bounce = 0;
+                                               p->friction = 0;
+                                               p->gravity = 0;
+                                               p->scalex *= 1.25f;
+                                               p->scaley *= 1.25f;
+                                       }
+                                       else
+                                       {
+                                               p->die = -1;
+                                               freeparticles[j++] = p;
+                                               continue;
+                                       }
                                }
                                else
                                {
@@ -880,7 +1226,7 @@ void CL_MoveParticles (void)
                {
                        f = p->friction * frametime;
                        if (!content)
-                               content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
+                               content = Mod_PointContents(p->org, cl.worldmodel);
                        if (content != CONTENTS_EMPTY)
                                f *= 4;
                        f = 1.0f - f;
@@ -893,7 +1239,7 @@ void CL_MoveParticles (void)
                        {
                        case pt_blood:
                                if (!content)
-                                       content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
+                                       content = Mod_PointContents(p->org, cl.worldmodel);
                                a = content;
                                if (a != CONTENTS_EMPTY)
                                {
@@ -911,7 +1257,7 @@ void CL_MoveParticles (void)
                                break;
                        case pt_bubble:
                                if (!content)
-                                       content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
+                                       content = Mod_PointContents(p->org, cl.worldmodel);
                                if (content != CONTENTS_WATER && content != CONTENTS_SLIME)
                                {
                                        p->die = -1;
@@ -928,11 +1274,22 @@ void CL_MoveParticles (void)
                                        p->vel[2] = /*lhrandom(-32, 32) +*/ p->vel2[2];
                                }
                                if (!content)
-                                       content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
+                                       content = Mod_PointContents(p->org, cl.worldmodel);
                                a = content;
                                if (a != CONTENTS_EMPTY && a != CONTENTS_SKY)
                                        p->die = -1;
                                break;
+                       case pt_grow:
+                               p->scalex += frametime * p->time2;
+                               p->scaley += frametime * p->time2;
+                               break;
+                       case pt_decal:
+                               if (cl.time > p->time2)
+                               {
+                                       p->alphafade = p->alpha / (p->die - cl.time);
+                                       p->time2 += 10000;
+                               }
+                               break;
                        default:
                                printf("unknown particle type %i\n", p->type);
                                p->die = -1;
@@ -991,19 +1348,29 @@ void CL_MoveParticles (void)
        }
 }
 
-static rtexturepool_t *particletexturepool;
+#define MAX_PARTICLETEXTURES 64
+// particletexture_t is a rectangle in the particlefonttexture
+typedef struct
+{
+       rtexture_t *texture;
+       float s1, t1, s2, t2;
+}
+particletexture_t;
 
+#if WORKINGLQUAKE
+static int particlefonttexture;
+#else
+static rtexturepool_t *particletexturepool;
 static rtexture_t *particlefonttexture;
-// [0] is normal, [1] is fog, they may be the same
-static particletexture_t particletexture[MAX_PARTICLETEXTURES][2];
+#endif
+static particletexture_t particletexture[MAX_PARTICLETEXTURES];
 
 static cvar_t r_drawparticles = {0, "r_drawparticles", "1"};
-static cvar_t r_particles_lighting = {0, "r_particles_lighting", "0"};
 
 static qbyte shadebubble(float dx, float dy, vec3_t light)
 {
-       float   dz, f, dot;
-       vec3_t  normal;
+       float dz, f, dot;
+       vec3_t normal;
        dz = 1 - (dx*dx+dy*dy);
        if (dz > 0) // it does hit the sphere
        {
@@ -1033,30 +1400,29 @@ static qbyte shadebubble(float dx, float dy, vec3_t light)
                return 0;
 }
 
-static void setuptex(int cltexnum, int fog, int rtexnum, qbyte *data, qbyte *particletexturedata)
+static void setuptex(int texnum, qbyte *data, qbyte *particletexturedata)
 {
        int basex, basey, y;
-       basex = ((rtexnum >> 0) & 7) * 32;
-       basey = ((rtexnum >> 3) & 7) * 32;
-       particletexture[cltexnum][fog].s1 = (basex + 1) / 256.0f;
-       particletexture[cltexnum][fog].t1 = (basey + 1) / 256.0f;
-       particletexture[cltexnum][fog].s2 = (basex + 31) / 256.0f;
-       particletexture[cltexnum][fog].t2 = (basey + 31) / 256.0f;
+       basex = ((texnum >> 0) & 7) * 32;
+       basey = ((texnum >> 3) & 7) * 32;
+       particletexture[texnum].s1 = (basex + 1) / 256.0f;
+       particletexture[texnum].t1 = (basey + 1) / 256.0f;
+       particletexture[texnum].s2 = (basex + 31) / 256.0f;
+       particletexture[texnum].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];
+       int x, y, d, i, j, k, m;
+       float cx, cy, dx, dy, radius, f, f2;
+       qbyte data[32][32][4], noise1[64][64], noise2[64][64], data2[64][16][4];
+       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++)
        {
@@ -1085,8 +1451,7 @@ static void R_InitParticleTexture (void)
                }
                while (m < 224);
 
-               setuptex(i + 0, 0, i + 0, &data[0][0][0], particletexturedata);
-               setuptex(i + 0, 1, i + 0, &data[0][0][0], particletexturedata);
+               setuptex(tex_smoke[i], &data[0][0][0], particletexturedata);
        }
 
        // rain splash
@@ -1106,8 +1471,7 @@ static void R_InitParticleTexture (void)
                                data[y][x][3] = (int) f;
                        }
                }
-               setuptex(i + 8, 0, i + 16, &data[0][0][0], particletexturedata);
-               setuptex(i + 8, 1, i + 16, &data[0][0][0], particletexturedata);
+               setuptex(tex_rainsplash[i], &data[0][0][0], particletexturedata);
        }
 
        // normal particle
@@ -1123,8 +1487,7 @@ static void R_InitParticleTexture (void)
                        data[y][x][3] = (qbyte) d;
                }
        }
-       setuptex(24, 0, 32, &data[0][0][0], particletexturedata);
-       setuptex(24, 1, 32, &data[0][0][0], particletexturedata);
+       setuptex(tex_particle, &data[0][0][0], particletexturedata);
 
        // rain
        light[0] = 1;light[1] = 1;light[2] = 1;
@@ -1137,8 +1500,7 @@ static void R_InitParticleTexture (void)
                        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, 0, 33, &data[0][0][0], particletexturedata);
-       setuptex(25, 1, 33, &data[0][0][0], particletexturedata);
+       setuptex(tex_raindrop, &data[0][0][0], particletexturedata);
 
        // bubble
        light[0] = 1;light[1] = 1;light[2] = 1;
@@ -1151,10 +1513,80 @@ static void R_InitParticleTexture (void)
                        data[y][x][3] = shadebubble((x - 16) * (1.0 / 16.0), (y - 16) * (1.0 / 16.0), light);
                }
        }
-       setuptex(26, 0, 34, &data[0][0][0], particletexturedata);
-       setuptex(26, 1, 34, &data[0][0][0], particletexturedata);
+       setuptex(tex_bubble, &data[0][0][0], particletexturedata);
+
+       // smoke/blood
+       for (i = 0;i < 8;i++)
+       {
+               memset(&data[0][0][0], 255, sizeof(data));
+               for (j = 1;j < 8;j++)
+               {
+                       for (k = 0;k < 3;k++)
+                       {
+                               cx = lhrandom(j + 1, 30 - j);
+                               cy = lhrandom(j + 1, 30 - j);
+                               for (y = 0;y < 32;y++)
+                               {
+                                       for (x = 0;x < 32;x++)
+                                       {
+                                               dx = (x - cx);
+                                               dy = (y - cy);
+                                               f = 1.0f - sqrt(dx * dx + dy * dy) / j;
+                                               if (f > 0)
+                                               {
+                                                       data[y][x][0] = data[y][x][0] + f * 0.5 * ( 160 - data[y][x][0]);
+                                                       data[y][x][1] = data[y][x][1] + f * 0.5 * ( 32 - data[y][x][1]);
+                                                       data[y][x][2] = data[y][x][2] + f * 0.5 * ( 32 - data[y][x][2]);
+                                               }
+                                       }
+                               }
+                       }
+               }
+               // use inverted colors so we can scale them later using glColor and use an inverse blend
+               for (y = 0;y < 32;y++)
+               {
+                       for (x = 0;x < 32;x++)
+                       {
+                               data[y][x][0] = 255 - data[y][x][0];
+                               data[y][x][1] = 255 - data[y][x][1];
+                               data[y][x][2] = 255 - data[y][x][2];
+                       }
+               }
+               setuptex(tex_blooddecal[i], &data[0][0][0], particletexturedata);
+       }
 
-       particlefonttexture = R_LoadTexture (particletexturepool, "particlefont", 256, 256, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
+#if WORKINGLQUAKE
+       glBindTexture(GL_TEXTURE_2D, (particlefonttexture = gl_extension_number++));
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+#else
+       particlefonttexture = R_LoadTexture2D(particletexturepool, "particlefont", 256, 256, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+       for (i = 0;i < MAX_PARTICLETEXTURES;i++)
+               particletexture[i].texture = particlefonttexture;
+
+       // beam
+       fractalnoise(&noise1[0][0], 64, 4);
+       m = 0;
+       for (y = 0;y < 64;y++)
+       {
+               for (x = 0;x < 16;x++)
+               {
+                       if (x < 8)
+                               d = x;
+                       else
+                               d = (15 - x);
+                       d = d * d * noise1[y][x] / (7 * 7);
+                       data2[y][x][0] = data2[y][x][1] = data2[y][x][2] = (qbyte) bound(0, d, 255);
+                       data2[y][x][3] = 255;
+               }
+       }
+
+       particletexture[tex_beam].texture = R_LoadTexture2D(particletexturepool, "beam", 16, 64, &data2[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
+       particletexture[tex_beam].s1 = 0;
+       particletexture[tex_beam].t1 = 0;
+       particletexture[tex_beam].s2 = 1;
+       particletexture[tex_beam].t2 = 1;
+#endif
 }
 
 static void r_part_start(void)
@@ -1170,230 +1602,224 @@ static void r_part_shutdown(void)
 
 static void r_part_newmap(void)
 {
+       cl_numparticles = 0;
 }
 
 void R_Particles_Init (void)
 {
        Cvar_RegisterVariable(&r_drawparticles);
-       Cvar_RegisterVariable(&r_particles_lighting);
+#ifdef WORKINGLQUAKE
+       r_part_start();
+#else
        R_RegisterModule("R_Particles", r_part_start, r_part_shutdown, r_part_newmap);
+#endif
 }
 
-int partindexarray[6] = {0, 1, 2, 0, 2, 3};
-
-void R_DrawParticles (void)
+#ifdef WORKINGLQUAKE
+void R_InitParticles(void)
 {
-       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;
-       rmeshinfo_t m;
-       particle_t *p;
-
-       // LordHavoc: early out conditions
-       if ((!cl_numparticles) || (!r_drawparticles.integer))
-               return;
-
-       lighting = r_particles_lighting.integer;
-       if (!r_dynamic.integer)
-               lighting = 0;
-
-       c_particles += cl_numparticles;
+       CL_Particles_Init();
+       R_Particles_Init();
+}
 
-       uprightangles[0] = 0;
-       uprightangles[1] = r_refdef.viewangles[1];
-       uprightangles[2] = 0;
-       AngleVectors (uprightangles, NULL, right2, up2);
+float varray_vertex[16];
+#endif
 
-       minparticledist = DotProduct(r_origin, vpn) + 16.0f;
+#ifdef WORKINGLQUAKE
+void R_DrawParticle(particle_t *p)
+{
+#else
+void R_DrawParticleCallback(const void *calldata1, int calldata2)
+{
+       const particle_t *p = calldata1;
+       rmeshstate_t m;
+#endif
+       float org[3], up2[3], v[3], right[3], up[3], fog, ifog, fogvec[3], cr, cg, cb, ca;
+       particletexture_t *tex;
 
-       // LordHavoc: this meshinfo must match up with R_Mesh_DrawDecal
-       // LordHavoc: the commented out lines are hardwired behavior in R_Mesh_DrawDecal
-       memset(&m, 0, sizeof(m));
-       m.transparent = true;
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-       m.numtriangles = 2;
-       m.index = partindexarray;
-       m.numverts = 4;
-       m.vertex = &tvxyz[0][0];
-       m.vertexstep = sizeof(float[4]);
-       m.tex[0] = R_GetTexture(particlefonttexture);
-       m.texcoords[0] = &tvst[0][0];
-       m.texcoordstep[0] = sizeof(float[2]);
+       VectorCopy(p->org, org);
 
-       for (i = 0, p = particles;i < cl_numparticles;i++, p++)
+       if (p->orientation == PARTICLE_BILLBOARD)
        {
-               // LordHavoc: only render if not too close
-               if (DotProduct(p->org, vpn) < minparticledist)
-                       continue;
-
-               // LordHavoc: check if it's in a visible leaf
-               leaf = Mod_PointInLeaf(p->org, cl.worldmodel);
-               if (leaf->visframe != r_framecount)
-                       continue;
-
-               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;
-               if (orientation == PARTICLE_BILLBOARD)
-               {
-                       VectorScale(vright, p->scalex, right);
-                       VectorScale(vup, p->scaley, up);
-               }
-               else if (orientation == PARTICLE_UPRIGHT_FACING)
-               {
-                       VectorScale(right2, p->scalex, right);
-                       VectorScale(up2, p->scaley, up);
-               }
-               else if (orientation == PARTICLE_ORIENTED_DOUBLESIDED)
+               VectorScale(vright, p->scalex, right);
+               VectorScale(vup, p->scaley, up);
+               varray_vertex[ 0] = org[0] + right[0] - up[0];
+               varray_vertex[ 1] = org[1] + right[1] - up[1];
+               varray_vertex[ 2] = org[2] + right[2] - up[2];
+               varray_vertex[ 4] = org[0] - right[0] - up[0];
+               varray_vertex[ 5] = org[1] - right[1] - up[1];
+               varray_vertex[ 6] = org[2] - right[2] - up[2];
+               varray_vertex[ 8] = org[0] - right[0] + up[0];
+               varray_vertex[ 9] = org[1] - right[1] + up[1];
+               varray_vertex[10] = org[2] - right[2] + up[2];
+               varray_vertex[12] = org[0] + right[0] + up[0];
+               varray_vertex[13] = org[1] + right[1] + up[1];
+               varray_vertex[14] = org[2] + right[2] + up[2];
+       }
+       else if (p->orientation == PARTICLE_SPARK)
+       {
+               VectorMA(p->org, -p->scaley, p->vel, v);
+               VectorMA(p->org, p->scaley, p->vel, up2);
+               R_CalcBeamVerts(varray_vertex, v, up2, p->scalex);
+       }
+       else if (p->orientation == PARTICLE_BEAM)
+               R_CalcBeamVerts(varray_vertex, p->org, p->vel2, p->scalex);
+       else if (p->orientation == PARTICLE_ORIENTED_DOUBLESIDED)
+       {
+               // double-sided
+               if (DotProduct(p->vel2, r_origin) > DotProduct(p->vel2, org))
                {
-                       // 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);
+                       VectorNegate(p->vel2, v);
+                       VectorVectors(v, right, up);
                }
                else
-                       Host_Error("R_DrawParticles: unknown particle orientation %i\n", orientation);
+                       VectorVectors(p->vel2, right, up);
+               VectorScale(right, p->scalex, right);
+               VectorScale(up, p->scaley, up);
+               varray_vertex[ 0] = org[0] + right[0] - up[0];
+               varray_vertex[ 1] = org[1] + right[1] - up[1];
+               varray_vertex[ 2] = org[2] + right[2] - up[2];
+               varray_vertex[ 4] = org[0] - right[0] - up[0];
+               varray_vertex[ 5] = org[1] - right[1] - up[1];
+               varray_vertex[ 6] = org[2] - right[2] - up[2];
+               varray_vertex[ 8] = org[0] - right[0] + up[0];
+               varray_vertex[ 9] = org[1] - right[1] + up[1];
+               varray_vertex[10] = org[2] - right[2] + up[2];
+               varray_vertex[12] = org[0] + right[0] + up[0];
+               varray_vertex[13] = org[1] + right[1] + up[1];
+               varray_vertex[14] = org[2] + right[2] + up[2];
+       }
+       else
+               Host_Error("R_DrawParticles: unknown particle orientation %i\n", p->orientation);
+
+       tex = &particletexture[p->texnum];
+       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 (p->blendmode == PBLEND_MOD)
+       {
+               cr *= ca;
+               cg *= ca;
+               cb *= ca;
+               cr = min(cr, 1);
+               cg = min(cg, 1);
+               cb = min(cb, 1);
+               ca = 1;
+       }
 
-               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 && (dynlight || lighting >= 2))
-               {
-                       R_CompleteLightPoint(v, org, true, leaf);
-                       m.cr *= v[0];
-                       m.cg *= v[1];
-                       m.cb *= v[2];
-               }
+#if WORKINGLQUAKE
+       if (p->blendmode == 0)
+               glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       else if (p->blendmode == 1)
+               glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+       else
+               glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
+       glBegin(GL_QUADS);
+       glColor4f(cr, cg, cb, ca);
+       glTexCoord2f(tex->s2, tex->t1);glVertex3f(varray_vertex[ 0], varray_vertex[ 1], varray_vertex[ 2]);
+       glTexCoord2f(tex->s1, tex->t1);glVertex3f(varray_vertex[ 4], varray_vertex[ 5], varray_vertex[ 6]);
+       glTexCoord2f(tex->s1, tex->t2);glVertex3f(varray_vertex[ 8], varray_vertex[ 9], varray_vertex[10]);
+       glTexCoord2f(tex->s2, tex->t2);glVertex3f(varray_vertex[12], varray_vertex[13], varray_vertex[14]);
+       glEnd();
+#else
+       memset(&m, 0, sizeof(m));
+       if (p->blendmode == 0)
+       {
+               m.blendfunc1 = GL_SRC_ALPHA;
+               m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+       }
+       else if (p->blendmode == 1)
+       {
+               m.blendfunc1 = GL_SRC_ALPHA;
+               m.blendfunc2 = GL_ONE;
+       }
+       else
+       {
+               m.blendfunc1 = GL_ZERO;
+               m.blendfunc2 = GL_ONE_MINUS_SRC_COLOR;
+       }
+       m.tex[0] = R_GetTexture(tex->texture);
+       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_State(&m);
 
-               tex = &particletexture[texnum][0];
-
-               tvxyz[0][0] = org[0] - right[0] - up[0];
-               tvxyz[0][1] = org[1] - right[1] - up[1];
-               tvxyz[0][2] = org[2] - right[2] - up[2];
-               tvxyz[1][0] = org[0] - right[0] + up[0];
-               tvxyz[1][1] = org[1] - right[1] + up[1];
-               tvxyz[1][2] = org[2] - right[2] + up[2];
-               tvxyz[2][0] = org[0] + right[0] + up[0];
-               tvxyz[2][1] = org[1] + right[1] + up[1];
-               tvxyz[2][2] = org[2] + right[2] + up[2];
-               tvxyz[3][0] = org[0] + right[0] - up[0];
-               tvxyz[3][1] = org[1] + right[1] - up[1];
-               tvxyz[3][2] = org[2] + right[2] - up[2];
-               tvst[0][0] = tex->s1;
-               tvst[0][1] = tex->t1;
-               tvst[1][0] = tex->s1;
-               tvst[1][1] = tex->t2;
-               tvst[2][0] = tex->s2;
-               tvst[2][1] = tex->t2;
-               tvst[3][0] = tex->s2;
-               tvst[3][1] = tex->t1;
-
-               if (additive)
+       if (fogenabled && p->blendmode != PBLEND_MOD)
+       {
+               VectorSubtract(org, r_origin, fogvec);
+               fog = exp(fogdensity/DotProduct(fogvec,fogvec));
+               ifog = 1 - fog;
+               cr = cr * ifog;
+               cg = cg * ifog;
+               cb = cb * ifog;
+               if (p->blendmode == 0)
                {
-                       m.blendfunc2 = GL_ONE;
-                       fog = 0;
-                       if (fogenabled)
-                       {
-                               texfog = &particletexture[texnum][1];
-                               VectorSubtract(org, r_origin, fogvec);
-                               ifog = 1 - exp(fogdensity/DotProduct(fogvec,fogvec));
-                               if (ifog < (1.0f - (1.0f / 64.0f)))
-                               {
-                                       if (ifog >= (1.0f / 64.0f))
-                                       {
-                                               // partially fogged, darken it
-                                               m.cr *= ifog;
-                                               m.cg *= ifog;
-                                               m.cb *= ifog;
-                                               R_Mesh_Draw(&m);
-                                       }
-                               }
-                               else
-                                       R_Mesh_Draw(&m);
-                       }
-                       else
-                               R_Mesh_Draw(&m);
-               }
-               else
-               {
-                       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-                       fog = 0;
-                       if (fogenabled)
-                       {
-                               texfog = &particletexture[texnum][1];
-                               VectorSubtract(org, r_origin, fogvec);
-                               fog = exp(fogdensity/DotProduct(fogvec,fogvec));
-                               if (fog >= (1.0f / 64.0f))
-                               {
-                                       if (fog >= (1.0f - (1.0f / 64.0f)))
-                                       {
-                                               // fully fogged, just use the fog texture and render as alpha
-                                               m.cr = fogcolor[0];
-                                               m.cg = fogcolor[1];
-                                               m.cb = fogcolor[2];
-                                               tvst[0][0] = texfog->s1;
-                                               tvst[0][1] = texfog->t1;
-                                               tvst[1][0] = texfog->s1;
-                                               tvst[1][1] = texfog->t2;
-                                               tvst[2][0] = texfog->s2;
-                                               tvst[2][1] = texfog->t2;
-                                               tvst[3][0] = texfog->s2;
-                                               tvst[3][1] = texfog->t1;
-                                               R_Mesh_Draw(&m);
-                                       }
-                                       else
-                                       {
-                                               // partially fogged, darken the first pass
-                                               ifog = 1 - fog;
-                                               m.cr *= ifog;
-                                               m.cg *= ifog;
-                                               m.cb *= ifog;
-                                               if (tex->s1 == texfog->s1 && tex->t1 == texfog->t1)
-                                               {
-                                                       // fog texture is the same as the base, just change the color
-                                                       m.cr += fogcolor[0] * fog;
-                                                       m.cg += fogcolor[1] * fog;
-                                                       m.cb += fogcolor[2] * fog;
-                                                       R_Mesh_Draw(&m);
-                                               }
-                                               else
-                                               {
-                                                       // render the first pass (alpha), then do additive fog
-                                                       R_Mesh_Draw(&m);
-
-                                                       m.blendfunc2 = GL_ONE;
-                                                       m.cr = fogcolor[0] * fog;
-                                                       m.cg = fogcolor[1] * fog;
-                                                       m.cb = fogcolor[2] * fog;
-                                                       tvst[0][0] = texfog->s1;
-                                                       tvst[0][1] = texfog->t1;
-                                                       tvst[1][0] = texfog->s1;
-                                                       tvst[1][1] = texfog->t2;
-                                                       tvst[2][0] = texfog->s2;
-                                                       tvst[2][1] = texfog->t2;
-                                                       tvst[3][0] = texfog->s2;
-                                                       tvst[3][1] = texfog->t1;
-                                                       R_Mesh_Draw(&m);
-                                               }
-                                       }
-                               }
-                               else
-                                       R_Mesh_Draw(&m);
-                       }
-                       else
-                               R_Mesh_Draw(&m);
+                       cr += fogcolor[0] * fog;
+                       cg += fogcolor[1] * fog;
+                       cb += fogcolor[2] * fog;
                }
        }
+       cr *= r_colorscale;
+       cg *= r_colorscale;
+       cb *= r_colorscale;
+
+       if (p->orientation == PARTICLE_BEAM)
+       {
+               VectorSubtract(p->vel2, p->org, up);
+               VectorNormalizeFast(up);
+               v[0] = DotProduct(p->org, up) * (1.0f / 64.0f) - cl.time * 0.25;
+               v[1] = DotProduct(p->vel2, up) * (1.0f / 64.0f) - cl.time * 0.25;
+               varray_texcoord[0][0] = 1;varray_texcoord[0][1] = v[0];
+               varray_texcoord[0][4] = 0;varray_texcoord[0][5] = v[0];
+               varray_texcoord[0][8] = 0;varray_texcoord[0][9] = v[1];
+               varray_texcoord[0][12] = 1;varray_texcoord[0][13] = v[1];
+       }
+       else
+       {
+               varray_texcoord[0][0] = tex->s2;varray_texcoord[0][1] = tex->t1;
+               varray_texcoord[0][4] = tex->s1;varray_texcoord[0][5] = tex->t1;
+               varray_texcoord[0][8] = tex->s1;varray_texcoord[0][9] = tex->t2;
+               varray_texcoord[0][12] = tex->s2;varray_texcoord[0][13] = tex->t2;
+       }
+
+       GL_Color(cr, cg, cb, ca);
+       R_Mesh_Draw(4, 2, polygonelements);
+#endif
+}
+
+void R_DrawParticles (void)
+{
+       int i;
+       float minparticledist;
+       particle_t *p;
+
+#ifdef WORKINGLQUAKE
+       CL_MoveParticles();
+#endif
+
+       // LordHavoc: early out conditions
+       if ((!cl_numparticles) || (!r_drawparticles.integer))
+               return;
+
+       minparticledist = DotProduct(r_origin, vpn) + 16.0f;
+
+#ifdef WORKINGLQUAKE
+       glBindTexture(GL_TEXTURE_2D, particlefonttexture);
+       glEnable(GL_BLEND);
+       glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+       glDepthMask(0);
+       // LordHavoc: only render if not too close
+       for (i = 0, p = particles;i < cl_numparticles;i++, p++)
+               if (DotProduct(p->org, vpn) >= minparticledist)
+                       R_DrawParticle(p);
+       glDepthMask(1);
+       glDisable(GL_BLEND);
+       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+#else
+       // LordHavoc: only render if not too close
+       c_particles += cl_numparticles;
+       for (i = 0, p = particles;i < cl_numparticles;i++, p++)
+               if (DotProduct(p->org, vpn) >= minparticledist || p->orientation == PARTICLE_BEAM)
+                       R_MeshQueue_AddTransparent(p->org, R_DrawParticleCallback, p, 0);
+#endif
 }