]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - r_part.c
added back r_speeds2, with masses of information (6 lines high), and made it print...
[xonotic/darkplaces.git] / r_part.c
index ba99439922ed195e33183534dfcaa6889b02d71d..7f8627c96238dfd0223ef1b544f72366d0340d2e 100644 (file)
--- a/r_part.c
+++ b/r_part.c
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // LordHavoc: added dust, smoke, snow, bloodcloud, and many others
 typedef enum {
-       pt_static, pt_grav, pt_blob, pt_blob2, pt_smoke, pt_snow, pt_bloodcloud, pt_fallfadespark, pt_bubble, pt_fade, pt_smokecloud
+       pt_static, pt_grav, pt_blob, pt_blob2, pt_smoke, pt_snow, pt_rain, pt_bloodcloud, pt_fallfadespark, pt_bubble, pt_fade, pt_smokecloud, pt_splash
 } ptype_t;
 
 typedef struct particle_s
@@ -35,11 +35,11 @@ typedef struct particle_s
        vec3_t          vel;
        float           die;
        ptype_t         type;
-       // LordHavoc: added for improved particle effects
        float           scale;
        short           texnum;
        float           alpha; // 0-255
        float           time2; // used for various things (snow fluttering, for example)
+       vec3_t          oldorg;
        vec3_t          vel2; // used for snow fluttering (base velocity, wind for instance)
 } particle_t;
 
@@ -69,20 +69,53 @@ particle_t  **freeparticles; // list used only in compacting particles array
 cvar_t r_particles = {"r_particles", "1"};
 cvar_t r_dynamicparticles = {"r_dynamicparticles", "0", TRUE};
 
+byte shadebubble(float dx, float dy, vec3_t light)
+{
+       float   dz, f, dot;
+       vec3_t  normal;
+       if ((dx*dx+dy*dy) < 1) // it does hit the sphere
+       {
+               dz = 1 - (dx*dx+dy*dy);
+               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 (byte) f;
+       }
+       else
+               return 0;
+}
+
 void R_InitParticleTexture (void)
 {
-       int             x,y,d,i;
-       float   dx, dy, dz, f, dot;
-       byte    data[32][32][4], noise1[32][32], noise2[32][32];
-       vec3_t  normal, light;
+       int             x,y,d,i,m;
+       float   dx, dy;
+       byte    data[32][32][4], noise1[128][128], noise2[128][128];
+       vec3_t  light;
 
-       for (x=0 ; x<32 ; x++)
+       for (y = 0;y < 32;y++)
        {
-               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;
-                       dy = y - 16;
                        d = (255 - (dx*dx+dy*dy));
                        if (d < 0) d = 0;
                        data[y][x][3] = (byte) d;
@@ -92,50 +125,51 @@ void R_InitParticleTexture (void)
 
        for (i = 0;i < 8;i++)
        {
-               fractalnoise(&noise1[0][0], 32);
-               fractalnoise(&noise2[0][0], 32);
-               for (y = 0;y < 32;y++)
-                       for (x = 0;x < 32;x++)
+               do
+               {
+                       fractalnoise(&noise1[0][0], 128, 8);
+                       fractalnoise(&noise2[0][0], 128, 16);
+                       m = 0;
+                       for (y = 0;y < 32;y++)
                        {
-                               data[y][x][0] = data[y][x][1] = data[y][x][2] = (noise1[y][x] >> 1) + 128;
-                               dx = x - 16;
                                dy = y - 16;
-                               d = noise2[y][x] * 4 - 512;
-                               if (d > 0)
+                               for (x = 0;x < 32;x++)
                                {
-                                       if (d > 255)
-                                               d = 255;
-                                       d = (d * (255 - (int) (dx*dx+dy*dy))) >> 8;
-                                       if (d < 0) d = 0;
-                                       if (d > 255) d = 255;
-                                       data[y][x][3] = (byte) d;
+                                       int j;
+                                       j = (noise1[y][x] - 128) * 2 + 128;
+                                       if (j < 0) j = 0;
+                                       if (j > 255) j = 255;
+                                       data[y][x][0] = data[y][x][1] = data[y][x][2] = j;
+                                       dx = x - 16;
+                                       d = (noise2[y][x] - 128) * 4 + 128;
+                                       if (d > 0)
+                                       {
+                                               d = (d * (255 - (int) (dx*dx+dy*dy))) >> 8;
+                                               //j = (sqrt(dx*dx+dy*dy) * 2.0f - 16.0f);
+                                               //if (j > 0)
+                                               //      d = (d * (255 - j*j)) >> 8;
+                                               if (d < 0) d = 0;
+                                               if (d > 255) d = 255;
+                                               data[y][x][3] = (byte) d;
+                                               if (m < d)
+                                                       m = d;
+                                       }
                                }
-                               else
-                                       data[y][x][3] = 0;
                        }
+               }
+               while (m < 192);
 
                smokeparticletexture[i] = GL_LoadTexture (va("smokeparticletexture%d", i), 32, 32, &data[0][0][0], true, true, 4);
        }
 
+       light[0] = 1;light[1] = 1;light[2] = 1;
+       VectorNormalize(light);
        for (x=0 ; x<32 ; x++)
        {
                for (y=0 ; y<32 ; y++)
                {
                        data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
-                       if (y < 24) // stretch the upper half to make a raindrop
-                       {
-                               dx = (x - 16)*2;
-                               dy = (y - 24)*2/3;
-                               d = (255 - (dx*dx+dy*dy))/2;
-                       }
-                       else
-                       {
-                               dx = (x - 16)*2;
-                               dy = (y - 24)*2;
-                               d = (255 - (dx*dx+dy*dy))/2;
-                       }
-                       if (d < 0) d = 0;
-                       data[y][x][3] = (byte) d;
+                       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);
                }
        }
        rainparticletexture = GL_LoadTexture ("rainparticletexture", 32, 32, &data[0][0][0], true, true, 4);
@@ -147,34 +181,7 @@ void R_InitParticleTexture (void)
                for (y=0 ; y<32 ; y++)
                {
                        data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
-                       dx = x * (1.0 / 16.0) - 1.0;
-                       dy = y * (1.0 / 16.0) - 1.0;
-                       if (dx*dx+dy*dy < 1) // it does hit the sphere
-                       {
-                               dz = 1 - (dx*dx+dy*dy);
-                               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 *= 64;
-                               f = bound(0, f, 255);
-                               data[y][x][3] = (byte) f;
-                       }
-                       else
-                               data[y][x][3] = 0;
+                       data[y][x][3] = shadebubble((x - 16) * (1.0 / 16.0), (y - 16) * (1.0 / 16.0), light);
                }
        }
        bubbleparticletexture = GL_LoadTexture ("bubbleparticletexture", 32, 32, &data[0][0][0], true, true, 4);
@@ -182,15 +189,15 @@ void R_InitParticleTexture (void)
 
 void r_part_start()
 {
-       particles = (particle_t *) malloc (r_numparticles * sizeof(particle_t));
-       freeparticles = (void *) malloc (r_numparticles * sizeof(particle_t *));
+       particles = (particle_t *) qmalloc(r_numparticles * sizeof(particle_t));
+       freeparticles = (void *) qmalloc(r_numparticles * sizeof(particle_t *));
        R_InitParticleTexture ();
 }
 
 void r_part_shutdown()
 {
-       free(particles);
-       free(freeparticles);
+       qfree(particles);
+       qfree(freeparticles);
 }
 
 /*
@@ -198,6 +205,7 @@ void r_part_shutdown()
 R_InitParticles
 ===============
 */
+void R_ReadPointFile_f (void);
 void R_Particles_Init (void)
 {
        int             i;
@@ -215,6 +223,8 @@ void R_Particles_Init (void)
                r_numparticles = MAX_PARTICLES;
        }
 
+       Cmd_AddCommand ("pointfile", R_ReadPointFile_f);        
+
        Cvar_RegisterVariable (&r_particles);
        Cvar_RegisterVariable (&r_dynamicparticles);
 
@@ -473,12 +483,20 @@ void R_ParticleExplosion (vec3_t org, int smoke)
        int                     i;
        if (!r_particles.value) return; // LordHavoc: particles are optional
 
-       particle(pt_smokecloud, (rand()&7) + 8, smokeparticletexture[rand()&7], 30, 96, 2, org[0], org[1], org[2], 0, 0, 0);
+       particle(pt_smokecloud, (rand()&7) + 8, smokeparticletexture[rand()&7], 30, 255, 2, org[0], org[1], org[2], 0, 0, 0);
 
        i = Mod_PointInLeaf(org, cl.worldmodel)->contents;
        if (i == CONTENTS_SLIME || i == CONTENTS_WATER)
-               for (i=0 ; i<32 ; i++)
-                       particle2(pt_bubble, (rand()&3) + 12, bubbleparticletexture, lhrandom(1, 2), 255, 2, org, 16, 16);
+       {
+               for (i=0 ; i<128 ; i++)
+                       particle2(pt_bubble, (rand()&3) + 12, bubbleparticletexture, lhrandom(1, 2), 255, 2, org, 16, 96);
+       }
+       else
+       {
+               for (i = 0;i < 256;i++)
+                       particle(pt_fallfadespark, ramp3[rand()%6], particletexture, 1.5, lhrandom(128, 255), 5, lhrandom(-16, 16) + org[0], lhrandom(-16, 16) + org[1], lhrandom(-16, 16) + org[2], lhrandom(-192, 192), lhrandom(-192, 192), lhrandom(-192, 192) + 192);
+       }
+
 }
 
 /*
@@ -550,17 +568,20 @@ void R_SparkShower (vec3_t org, vec3_t dir, int count)
        if (!r_particles.value) return; // LordHavoc: particles are optional
 
        // smoke puff
-       particle(pt_smokecloud, 12+(rand()&3), smokeparticletexture[rand()&7], 8, 64, 99, org[0], org[1], org[2], 0, 0, 0);
+       particle(pt_smoke, 12+(rand()&3), smokeparticletexture[rand()&7], 8, 160, 99, org[0], org[1], org[2], 0, 0, 0);
        // sparks
        while(count--)
-               particle2(pt_fallfadespark, ramp3[rand()%6], particletexture, 1, lhrandom(0, 255), 5, org, 4, 96);
+//             particle2(pt_fallfadespark, ramp3[rand()%6], particletexture, 1, lhrandom(0, 255), 5, org, 4, 96);
+               particle(pt_fallfadespark, ramp3[rand()%6], particletexture, 1, lhrandom(0, 255), 5, lhrandom(-4, 4) + org[0], lhrandom(-4, 4) + org[1], lhrandom(-4, 4) + org[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64) + 64);
 }
 
 void R_BloodPuff (vec3_t org)
 {
        if (!r_particles.value) return; // LordHavoc: particles are optional
 
-       particle(pt_bloodcloud, 68+(rand()&3), smokeparticletexture[rand()&7], 12, 128, 99, org[0], org[1], org[2], 0, 0, 0);
+       particle(pt_bloodcloud, 251 /*68+(rand()&3)*/, smokeparticletexture[rand()&7], 12, 128, 99, org[0], org[1], org[2], 0, 0, 0);
+       particle(pt_bloodcloud, 251 /*68+(rand()&3)*/, smokeparticletexture[rand()&7], 10, 128, 99, org[0] + lhrandom(-4, 4), org[1] + lhrandom(-4, 4), org[2] + lhrandom(-4, 4), 0, 0, 0);
+       particle(pt_bloodcloud, 251 /*68+(rand()&3)*/, smokeparticletexture[rand()&7], 8, 128, 99, org[0] + lhrandom(-4, 4), org[1] + lhrandom(-4, 4), org[2] + lhrandom(-4, 4), 0, 0, 0);
 }
 
 void R_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count)
@@ -586,11 +607,11 @@ void R_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count)
                ALLOCPARTICLE
 
                p->texnum = smokeparticletexture[rand()&7];
-               p->scale = lhrandom(6, 8);
+               p->scale = lhrandom(4, 6);
                p->alpha = 96 + (rand()&63);
                p->die = cl.time + 2;
                p->type = pt_bloodcloud;
-               p->color = (rand()&3)+68;
+               p->color = 251; //(rand()&3)+68;
                for (j=0 ; j<3 ; j++)
                {
                        p->org[j] = diff[j] * (float) (rand()%1024) * (1.0 / 1024.0) + mins[j];
@@ -675,18 +696,19 @@ void R_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorb
                org[1] = diff[1] * (float) (rand()&1023) * (1.0 / 1024.0) + mins[1];
                org[2] = z;
 
-               p->scale = 1.5;
                p->alpha = 255;
                p->die = t;
                if (type == 1)
                {
+                       p->scale = 2;
                        p->texnum = particletexture;
                        p->type = pt_snow;
                }
                else // 0
                {
+                       p->scale = 3;
                        p->texnum = rainparticletexture;
-                       p->type = pt_static;
+                       p->type = pt_rain;
                }
                p->color = colorbase + (rand()&3);
                VectorCopy(org, p->org);
@@ -777,7 +799,6 @@ void R_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
        float           len, dec = 0, t, nt, speed;
        int                     j, contents, bubbles;
        particle_t      *p;
-       static int      tracercount;
        if (!r_particles.value) return; // LordHavoc: particles are optional
 
        t = cl.oldtime;
@@ -814,11 +835,11 @@ void R_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                        case 1: // grenade trail
                                if (bubbles)
                                {
-                                       dec = 0.005f;
+                                       dec = type == 0 ? 0.01f : 0.02f;
                                        p->texnum = bubbleparticletexture;
                                        p->scale = lhrandom(1,2);
                                        p->alpha = 255;
-                                       p->color = (rand()&3)+12;
+                                       p->color = 254;
                                        p->type = pt_bubble;
                                        p->die = cl.time + 2;
                                        for (j=0 ; j<3 ; j++)
@@ -829,14 +850,21 @@ void R_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                                }
                                else
                                {
-                                       dec = 0.02f;
+                                       dec = type == 0 ? 0.01f : 0.02f;
                                        p->texnum = smokeparticletexture[rand()&7];
-                                       p->scale = lhrandom(8, 12);
-                                       p->alpha = 64 + (rand()&31);
-                                       p->color = (rand()&3)+12;
+                                       p->scale = lhrandom(4, 8);
+                                       p->alpha = 160; //128 + (rand()&63);
+                                       p->color = 254;
                                        p->type = pt_smoke;
                                        p->die = cl.time + 10000;
                                        VectorCopy(start, p->org);
+                                       if (type == 0)
+                                       {
+                                               particle(pt_fallfadespark, 0x68 + (rand() & 7), particletexture, 1, lhrandom(64, 128), 5, start[0], start[1], start[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64));
+                                               particle(pt_fallfadespark, 0x68 + (rand() & 7), particletexture, 1, lhrandom(64, 128), 5, start[0], start[1], start[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64));
+                                               particle(pt_fallfadespark, 0x68 + (rand() & 7), particletexture, 1, lhrandom(64, 128), 5, start[0], start[1], start[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64));
+                                               particle(pt_fallfadespark, 0x68 + (rand() & 7), particletexture, 1, lhrandom(64, 128), 5, start[0], start[1], start[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64));
+                                       }
                                }
                                break;
 
@@ -860,9 +888,9 @@ void R_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                        case 4: // slight blood
                                dec = 0.025f;
                                p->texnum = smokeparticletexture[rand()&7];
-                               p->scale = lhrandom(6, 8);
+                               p->scale = lhrandom(4, 6);
                                p->alpha = type == 4 ? 192 : 255;
-                               p->color = (rand()&3)+68;
+                               p->color = 247; //(rand()&3)+68;
                                p->type = pt_bloodcloud;
                                p->die = cl.time + 9999;
                                for (j=0 ; j<3 ; j++)
@@ -936,90 +964,44 @@ void R_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent)
 }
 
 
-extern qboolean lighthalf;
-
 /*
 ===============
 R_DrawParticles
 ===============
 */
 extern cvar_t  sv_gravity;
-void R_CompleteLightPoint (vec3_t color, vec3_t p);
 
-void R_DrawParticles (void)
+void TraceLine (vec3_t start, vec3_t end, vec3_t impact);
+
+void R_MoveParticles (void)
 {
        particle_t              *p;
-       int                             i, r,g,b,a;
-       float                   gravity, dvel, frametime, scale, scale2, minparticledist;
-       byte                    *color24;
-       vec3_t                  up, right, uprightangles, forward2, up2, right2, tempcolor;
-       int                             activeparticles, maxparticle, j, k;
+       int                             i, activeparticles, maxparticle, j, a;
+       vec3_t                  v;
+       float                   gravity, dvel, frametime;
 
        // LordHavoc: early out condition
        if (!numparticles)
                return;
 
-       VectorScale (vup, 1.5, up);
-       VectorScale (vright, 1.5, right);
-
-       uprightangles[0] = 0;
-       uprightangles[1] = r_refdef.viewangles[1];
-       uprightangles[2] = 0;
-       AngleVectors (uprightangles, forward2, right2, up2);
-
        frametime = cl.time - cl.oldtime;
        gravity = frametime * sv_gravity.value;
        dvel = 1+4*frametime;
 
-       minparticledist = DotProduct(r_refdef.vieworg, vpn) + 16.0f;
-
        activeparticles = 0;
        maxparticle = -1;
        j = 0;
-       for (k = 0, p = particles;k < numparticles;k++, p++)
+       for (i = 0, p = particles;i < numparticles;i++, p++)
        {
                if (p->die < cl.time)
                {
                        freeparticles[j++] = p;
                        continue;
                }
-               maxparticle = k;
+               maxparticle = i;
                activeparticles++;
 
-               // LordHavoc: only render if not too close
-               if (DotProduct(p->org, vpn) >= minparticledist)
-               {
-                       color24 = (byte *) &d_8to24table[(int)p->color];
-                       r = color24[0];
-                       g = color24[1];
-                       b = color24[2];
-                       a = p->alpha;
-                       if (r_dynamicparticles.value)
-                       {
-                               R_CompleteLightPoint(tempcolor, p->org);
-                               r = (r * (int) tempcolor[0]) >> 7;
-                               g = (g * (int) tempcolor[1]) >> 7;
-                               b = (b * (int) tempcolor[2]) >> 7;
-                       }
-                       transpolybegin(p->texnum, 0, p->texnum, TPOLYTYPE_ALPHA);
-                       scale = p->scale * -0.5;scale2 = p->scale * 0.5;
-                       if (p->texnum == rainparticletexture) // rain streak
-                       {
-                               transpolyvert(p->org[0] + up2[0]*scale  + right2[0]*scale , p->org[1] + up2[1]*scale  + right2[1]*scale , p->org[2] + up2[2]*scale  + right2[2]*scale , 0,1,r,g,b,a);
-                               transpolyvert(p->org[0] + up2[0]*scale2 + right2[0]*scale , p->org[1] + up2[1]*scale2 + right2[1]*scale , p->org[2] + up2[2]*scale2 + right2[2]*scale , 0,0,r,g,b,a);
-                               transpolyvert(p->org[0] + up2[0]*scale2 + right2[0]*scale2, p->org[1] + up2[1]*scale2 + right2[1]*scale2, p->org[2] + up2[2]*scale2 + right2[2]*scale2, 1,0,r,g,b,a);
-                               transpolyvert(p->org[0] + up2[0]*scale  + right2[0]*scale2, p->org[1] + up2[1]*scale  + right2[1]*scale2, p->org[2] + up2[2]*scale  + right2[2]*scale2, 1,1,r,g,b,a);
-                       }
-                       else
-                       {
-                               transpolyvert(p->org[0] + up[0]*scale  + right[0]*scale , p->org[1] + up[1]*scale  + right[1]*scale , p->org[2] + up[2]*scale  + right[2]*scale , 0,1,r,g,b,a);
-                               transpolyvert(p->org[0] + up[0]*scale2 + right[0]*scale , p->org[1] + up[1]*scale2 + right[1]*scale , p->org[2] + up[2]*scale2 + right[2]*scale , 0,0,r,g,b,a);
-                               transpolyvert(p->org[0] + up[0]*scale2 + right[0]*scale2, p->org[1] + up[1]*scale2 + right[1]*scale2, p->org[2] + up[2]*scale2 + right[2]*scale2, 1,0,r,g,b,a);
-                               transpolyvert(p->org[0] + up[0]*scale  + right[0]*scale2, p->org[1] + up[1]*scale  + right[1]*scale2, p->org[2] + up[2]*scale  + right[2]*scale2, 1,1,r,g,b,a);
-                       }
-                       transpolyend();
-               }
-
+               VectorCopy(p->org, p->oldorg);
                p->org[0] += p->vel[0]*frametime;
                p->org[1] += p->vel[1]*frametime;
                p->org[2] += p->vel[2]*frametime;
@@ -1029,26 +1011,17 @@ void R_DrawParticles (void)
                case pt_static:
                        break;
 
+                       // LordHavoc: drop-through because of shared code
                case pt_blob:
-                       for (i=0 ; i<3 ; i++)
-                               p->vel[i] *= dvel;
-                       break;
-
+                       p->vel[2] *= dvel;
                case pt_blob2:
-                       for (i=0 ; i<2 ; i++)
-                               p->vel[i] *= dvel;
+                       p->vel[0] *= dvel;
+                       p->vel[1] *= dvel;
                        break;
 
                case pt_grav:
                        p->vel[2] -= gravity;
                        break;
-// LordHavoc: for smoke trails
-               case pt_smoke:
-                       p->scale += frametime * 6;
-                       p->alpha -= frametime * 128;
-                       if (p->alpha < 1)
-                               p->die = -1;
-                       break;
                case pt_snow:
                        if (cl.time > p->time2)
                        {
@@ -1059,31 +1032,33 @@ void R_DrawParticles (void)
                        }
                        break;
                case pt_bloodcloud:
-                       if (Mod_PointInLeaf(p->org, cl.worldmodel)->contents != CONTENTS_EMPTY)
-                       {
-                               p->die = -1;
-                               break;
-                       }
-                       p->scale += frametime * 4;
-                       p->alpha -= frametime * 64;
-                       if (p->alpha < 1 || p->scale < 1)
-                               p->die = -1;
+//                     if (Mod_PointInLeaf(p->org, cl.worldmodel)->contents != CONTENTS_EMPTY)
+//                     {
+//                             p->die = -1;
+//                             break;
+//                     }
+                       p->scale += frametime * 16;
+                       p->alpha -= frametime * 512;
                        break;
                case pt_fallfadespark:
                        p->alpha -= frametime * 256;
                        p->vel[2] -= gravity;
-                       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->die = -1;
+                       {
+                               p->texnum = smokeparticletexture[rand()&7];
+                               p->type = pt_splash;
+                               p->alpha = 96;
+                               p->scale = 5;
+                               p->vel[0] = p->vel[1] = p->vel[2] = 0;
+                               p->die = cl.time + 1000;
+//                             p->die = -1;
+                       }
                        p->vel[2] += gravity * 0.25;
                        p->vel[0] *= (1 - (frametime * 0.0625));
                        p->vel[1] *= (1 - (frametime * 0.0625));
@@ -1096,16 +1071,68 @@ void R_DrawParticles (void)
                                p->vel[2] += lhrandom(-32,32);
                        }
                        p->alpha -= frametime * 64;
-                       if (p->alpha < 1)
-                               p->die = -1;
+                       break;
+// LordHavoc: for smoke trails
+               case pt_smoke:
+                       p->scale += frametime * 16;
+                       p->alpha -= frametime * 256;
                        break;
                case pt_smokecloud:
-                       p->scale += frametime * 60;
-                       p->alpha -= frametime * 96;
-                       if (p->alpha < 1)
-                               p->die = -1;
+                       p->scale += frametime * 64;
+                       p->alpha -= frametime * 256;
+                       break;
+               case pt_splash:
+                       p->scale += frametime * 24;
+                       p->alpha -= frametime * 512;
+                       break;
+               case pt_rain:
+                       a = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
+                       if (a != CONTENTS_EMPTY && a != CONTENTS_SKY)
+                       {
+                               if (a == CONTENTS_SOLID && Mod_PointInLeaf(p->oldorg, cl.worldmodel)->contents == CONTENTS_SOLID)
+                                       break; // still in solid
+                               p->die = cl.time + 1000;
+                               switch (a)
+                               {
+                               case CONTENTS_LAVA:
+                               case CONTENTS_SLIME:
+                                       p->texnum = smokeparticletexture[rand()&7];
+                                       p->type = pt_smokecloud;
+                                       p->alpha = 64;
+                                       p->vel[2] = 96;
+                                       break;
+                               case CONTENTS_WATER:
+                                       p->texnum = smokeparticletexture[rand()&7];
+                                       p->type = pt_splash;
+                                       p->alpha = 96;
+                                       p->scale = 5;
+                                       p->vel[0] = p->vel[1] = p->vel[2] = 0;
+//                                     p->texnum = bubbleparticletexture;
+//                                     p->type = pt_bubble;
+//                                     p->vel[2] *= 0.1;
+                                       break;
+                               default: // CONTENTS_SOLID and any others
+                                       TraceLine(p->oldorg, p->org, v);
+                                       VectorCopy(v, p->org);
+                                       p->texnum = smokeparticletexture[rand()&7];
+                                       p->type = pt_splash;
+                                       p->alpha = 96;
+                                       p->scale = 5;
+                                       p->vel[0] = p->vel[1] = p->vel[2] = 0;
+                                       p->die = cl.time + 1000;
+                                       break;
+                               }
+                       }
                        break;
                }
+
+               // LordHavoc: most particles did this check anyway, consistency...
+               if (p->alpha < 1)
+                       p->die = -1;
+
+               // LordHavoc: immediate removal of unnecessary particles (must be done to ensure compactor below operates properly in all cases)
+               if (p->die < cl.time)
+                       freeparticles[j++] = p;
        }
        // fill in gaps to compact the array
        i = 0;
@@ -1118,3 +1145,70 @@ void R_DrawParticles (void)
        numparticles = activeparticles;
 }
 
+void R_CompleteLightPoint (vec3_t color, vec3_t p);
+
+void R_DrawParticles (void)
+{
+       particle_t              *p;
+       int                             i, r,g,b,a;
+       float                   scale, scale2, minparticledist;
+       byte                    *color24;
+       vec3_t                  up, right, uprightangles, forward2, up2, right2, tempcolor;
+
+       // LordHavoc: early out condition
+       if (!numparticles)
+               return;
+
+       c_particles += numparticles;
+
+       VectorScale (vup, 1.5, up);
+       VectorScale (vright, 1.5, right);
+
+       uprightangles[0] = 0;
+       uprightangles[1] = r_refdef.viewangles[1];
+       uprightangles[2] = 0;
+       AngleVectors (uprightangles, forward2, right2, up2);
+
+       minparticledist = DotProduct(r_refdef.vieworg, vpn) + 16.0f;
+
+       for (i = 0, p = particles;i < numparticles;i++, p++)
+       {
+               // LordHavoc: unnecessary (array was already compacted)
+//             if (p->die < cl.time)
+//                     continue;
+
+               // LordHavoc: only render if not too close
+               if (DotProduct(p->org, vpn) < minparticledist)
+                       continue;
+
+               color24 = (byte *) &d_8to24table[(int)p->color];
+               r = color24[0];
+               g = color24[1];
+               b = color24[2];
+               a = p->alpha;
+               if (r_dynamicparticles.value)
+               {
+                       R_CompleteLightPoint(tempcolor, p->org);
+                       r = (r * (int) tempcolor[0]) >> 7;
+                       g = (g * (int) tempcolor[1]) >> 7;
+                       b = (b * (int) tempcolor[2]) >> 7;
+               }
+               transpolybegin(p->texnum, 0, p->texnum, TPOLYTYPE_ALPHA);
+               scale = p->scale * -0.5;scale2 = p->scale * 0.5;
+               if (p->texnum == rainparticletexture) // rain streak
+               {
+                       transpolyvert(p->org[0] + up2[0]*scale  + right2[0]*scale , p->org[1] + up2[1]*scale  + right2[1]*scale , p->org[2] + up2[2]*scale  + right2[2]*scale , 0,1,r,g,b,a);
+                       transpolyvert(p->org[0] + up2[0]*scale2 + right2[0]*scale , p->org[1] + up2[1]*scale2 + right2[1]*scale , p->org[2] + up2[2]*scale2 + right2[2]*scale , 0,0,r,g,b,a);
+                       transpolyvert(p->org[0] + up2[0]*scale2 + right2[0]*scale2, p->org[1] + up2[1]*scale2 + right2[1]*scale2, p->org[2] + up2[2]*scale2 + right2[2]*scale2, 1,0,r,g,b,a);
+                       transpolyvert(p->org[0] + up2[0]*scale  + right2[0]*scale2, p->org[1] + up2[1]*scale  + right2[1]*scale2, p->org[2] + up2[2]*scale  + right2[2]*scale2, 1,1,r,g,b,a);
+               }
+               else
+               {
+                       transpolyvert(p->org[0] + up[0]*scale  + right[0]*scale , p->org[1] + up[1]*scale  + right[1]*scale , p->org[2] + up[2]*scale  + right[2]*scale , 0,1,r,g,b,a);
+                       transpolyvert(p->org[0] + up[0]*scale2 + right[0]*scale , p->org[1] + up[1]*scale2 + right[1]*scale , p->org[2] + up[2]*scale2 + right[2]*scale , 0,0,r,g,b,a);
+                       transpolyvert(p->org[0] + up[0]*scale2 + right[0]*scale2, p->org[1] + up[1]*scale2 + right[1]*scale2, p->org[2] + up[2]*scale2 + right[2]*scale2, 1,0,r,g,b,a);
+                       transpolyvert(p->org[0] + up[0]*scale  + right[0]*scale2, p->org[1] + up[1]*scale  + right[1]*scale2, p->org[2] + up[2]*scale  + right[2]*scale2, 1,1,r,g,b,a);
+               }
+               transpolyend();
+       }
+}