added particle effect scripting using effectinfo.txt, this means configurable effects...
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 4 Apr 2006 13:51:22 +0000 (13:51 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 4 Apr 2006 13:51:22 +0000 (13:51 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6249 d7cf8633-e32d-0410-b094-e92efae38249

cl_main.c
cl_parse.c
cl_particles.c
client.h
clvm_cmds.c
r_explosion.c
todo

index 8c41941..b78ec29 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -743,8 +743,9 @@ void CL_LinkNetworkEntity(entity_t *e)
 {
        matrix4x4_t *matrix, blendmatrix, tempmatrix, matrix2;
        //matrix4x4_t dlightmatrix;
-       int j, k, l, trailtype, temp;
-       float origin[3], angles[3], delta[3], lerp, dlightcolor[3], dlightradius, mins[3], maxs[3], v2[3], d;
+       int j, k, l;
+       effectnameindex_t trailtype;
+       float origin[3], angles[3], delta[3], lerp, dlightcolor[3], dlightradius, v2[3], d;
        entity_t *t;
        model_t *model;
        trace_t trace;
@@ -961,7 +962,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                        origin[1] = e->render.matrix.m[1][3];
                        origin[2] = e->render.matrix.m[2][3];
                }
-               trailtype = -1;
+               trailtype = EFFECT_NONE;
                dlightradius = 0;
                dlightcolor[0] = 0;
                dlightcolor[1] = 0;
@@ -972,13 +973,7 @@ void CL_LinkNetworkEntity(entity_t *e)
                        if (e->render.effects & EF_BRIGHTFIELD)
                        {
                                if (gamemode == GAME_NEXUIZ)
-                               {
-                                       dlightradius = max(dlightradius, 200);
-                                       dlightcolor[0] += 0.75f;
-                                       dlightcolor[1] += 1.50f;
-                                       dlightcolor[2] += 3.00f;
-                                       trailtype = 8;
-                               }
+                                       trailtype = EFFECT_TR_NEXUIZPLASMA;
                                else
                                        CL_EntityParticles(e);
                        }
@@ -1014,38 +1009,9 @@ void CL_LinkNetworkEntity(entity_t *e)
                                dlightcolor[2] += 1.50f;
                        }
                        if (e->render.effects & EF_FLAME)
-                       {
-                               mins[0] = origin[0] - 16.0f;
-                               mins[1] = origin[1] - 16.0f;
-                               mins[2] = origin[2] - 16.0f;
-                               maxs[0] = origin[0] + 16.0f;
-                               maxs[1] = origin[1] + 16.0f;
-                               maxs[2] = origin[2] + 16.0f;
-                               // how many flames to make
-                               temp = (int) (cl.time * 300) - (int) (cl.oldtime * 300);
-                               CL_FlameCube(mins, maxs, temp);
-                               d = lhrandom(0.75f, 1);
-                               dlightradius = max(dlightradius, 200);
-                               dlightcolor[0] += d * 2.0f;
-                               dlightcolor[1] += d * 1.5f;
-                               dlightcolor[2] += d * 0.5f;
-                       }
+                               CL_ParticleEffect(EFFECT_EF_FLAME, cl.time - cl.oldtime, origin, origin, vec3_origin, vec3_origin, NULL, 0);
                        if (e->render.effects & EF_STARDUST)
-                       {
-                               mins[0] = origin[0] - 16.0f;
-                               mins[1] = origin[1] - 16.0f;
-                               mins[2] = origin[2] - 16.0f;
-                               maxs[0] = origin[0] + 16.0f;
-                               maxs[1] = origin[1] + 16.0f;
-                               maxs[2] = origin[2] + 16.0f;
-                               // how many particles to make
-                               temp = (int) (cl.time * 200) - (int) (cl.oldtime * 200);
-                               CL_Stardust(mins, maxs, temp);
-                               dlightradius = max(dlightradius, 200);
-                               dlightcolor[0] += 1.0f;
-                               dlightcolor[1] += 0.7f;
-                               dlightcolor[2] += 0.3f;
-                       }
+                               CL_ParticleEffect(EFFECT_EF_STARDUST, cl.time - cl.oldtime, origin, origin, vec3_origin, vec3_origin, NULL, 0);
                        if (e->render.effects & (EF_FLAG1QW | EF_FLAG2QW))
                        {
                                // these are only set on player entities
@@ -1068,56 +1034,22 @@ void CL_LinkNetworkEntity(entity_t *e)
                if (e->render.model && e->render.model->flags && (!e->state_current.tagentity && !(e->render.flags & RENDER_VIEWMODEL)))
                {
                        if (e->render.model->flags & EF_GIB)
-                               trailtype = 2;
+                               trailtype = EFFECT_TR_BLOOD;
                        else if (e->render.model->flags & EF_ZOMGIB)
-                               trailtype = 4;
+                               trailtype = EFFECT_TR_SLIGHTBLOOD;
                        else if (e->render.model->flags & EF_TRACER)
-                       {
-                               trailtype = 3;
-                               //dlightradius = max(dlightradius, 100);
-                               //dlightcolor[0] += 0.25f;
-                               //dlightcolor[1] += 1.00f;
-                               //dlightcolor[2] += 0.25f;
-                       }
+                               trailtype = EFFECT_TR_WIZSPIKE;
                        else if (e->render.model->flags & EF_TRACER2)
-                       {
-                               trailtype = 5;
-                               //dlightradius = max(dlightradius, 100);
-                               //dlightcolor[0] += 1.00f;
-                               //dlightcolor[1] += 0.60f;
-                               //dlightcolor[2] += 0.20f;
-                       }
+                               trailtype = EFFECT_TR_KNIGHTSPIKE;
                        else if (e->render.model->flags & EF_ROCKET)
-                       {
-                               trailtype = 0;
-                               dlightradius = max(dlightradius, 200);
-                               dlightcolor[0] += 3.00f;
-                               dlightcolor[1] += 1.50f;
-                               dlightcolor[2] += 0.50f;
-                       }
+                               trailtype = EFFECT_TR_ROCKET;
                        else if (e->render.model->flags & EF_GRENADE)
                        {
                                // LordHavoc: e->render.alpha == -1 is for Nehahra dem compatibility (cigar smoke)
-                               trailtype = e->render.alpha == -1 ? 7 : 1;
+                               trailtype = e->render.alpha == -1 ? EFFECT_TR_NEHAHRASMOKE : EFFECT_TR_GRENADE;
                        }
                        else if (e->render.model->flags & EF_TRACER3)
-                       {
-                               trailtype = 6;
-                               if (gamemode == GAME_PRYDON)
-                               {
-                                       dlightradius = max(dlightradius, 100);
-                                       dlightcolor[0] += 0.30f;
-                                       dlightcolor[1] += 0.60f;
-                                       dlightcolor[2] += 1.20f;
-                               }
-                               else
-                               {
-                                       dlightradius = max(dlightradius, 200);
-                                       dlightcolor[0] += 1.20f;
-                                       dlightcolor[1] += 0.50f;
-                                       dlightcolor[2] += 1.00f;
-                               }
-                       }
+                               trailtype = EFFECT_TR_VORESPIKE;
                }
                // LordHavoc: customizable glow
                if (e->state_current.glowsize)
@@ -1151,9 +1083,19 @@ void CL_LinkNetworkEntity(entity_t *e)
                }
                // do trails
                if (e->render.flags & RENDER_GLOWTRAIL)
-                       trailtype = 9;
-               if (trailtype >= 0)
-                       CL_RocketTrail(e->persistent.trail_origin, origin, trailtype, e->state_current.glowcolor, e);
+                       trailtype = EFFECT_TR_GLOWTRAIL;
+               if (trailtype)
+               {
+                       float len;
+                       vec3_t vel;
+                       VectorSubtract(e->state_current.origin, e->state_previous.origin, vel);
+                       len = e->state_current.time - e->state_previous.time;
+                       if (len > 0)
+                               len = 1.0f / len;
+                       VectorScale(vel, len, vel);
+                       len = VectorDistance(origin, e->persistent.trail_origin);
+                       CL_ParticleEffect(trailtype, len, e->persistent.trail_origin, origin, vel, vel, e, e->state_current.glowcolor);
+               }
                VectorCopy(origin, e->persistent.trail_origin);
                // tenebrae's sprites are all additive mode (weird)
                if (gamemode == GAME_TENEBRAE && e->render.model && e->render.model->type == mod_sprite)
index 4bde1fc..d7301fc 100644 (file)
@@ -1562,9 +1562,9 @@ void CL_ParseBeam (model_t *m, int lightning)
 void CL_ParseTempEntity(void)
 {
        int type;
-       vec3_t pos;
+       vec3_t pos, pos2;
+       vec3_t vel1, vel2;
        vec3_t dir;
-       vec3_t pos2;
        vec3_t color;
        int rnd;
        int colorStart, colorLength, count;
@@ -1581,9 +1581,7 @@ void CL_ParseTempEntity(void)
                        // spike hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       //CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-                       CL_RunParticleEffect(pos, vec3_origin, 20, 30);
+                       CL_ParticleEffect(EFFECT_TE_WIZSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        S_StartSound(-1, 0, cl.sfx_wizhit, pos, 1, 1);
                        break;
 
@@ -1591,9 +1589,7 @@ void CL_ParseTempEntity(void)
                        // spike hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       //CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-                       CL_RunParticleEffect(pos, vec3_origin, 226, 20);
+                       CL_ParticleEffect(EFFECT_TE_KNIGHTSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        S_StartSound(-1, 0, cl.sfx_knighthit, pos, 1, 1);
                        break;
 
@@ -1601,14 +1597,7 @@ void CL_ParseTempEntity(void)
                        // spike hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       if (cl_particles_quake.integer)
-                               CL_RunParticleEffect(pos, vec3_origin, 0, 10);
-                       else if (cl_particles_bulletimpacts.integer)
-                       {
-                               CL_SparkShower(pos, vec3_origin, 15, 1, 0);
-                               CL_Smoke(pos, vec3_origin, 15, 0);
-                       }
-                       CL_BulletMark(pos);
+                       CL_ParticleEffect(EFFECT_TE_SPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        if (rand() % 5)
                                S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
                        else
@@ -1626,14 +1615,7 @@ void CL_ParseTempEntity(void)
                        // super spike hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       if (cl_particles_quake.integer)
-                               CL_RunParticleEffect(pos, vec3_origin, 0, 20);
-                       else if (cl_particles_bulletimpacts.integer)
-                       {
-                               CL_SparkShower(pos, vec3_origin, 30, 1, 0);
-                               CL_Smoke(pos, vec3_origin, 30, 0);
-                       }
-                       CL_BulletMark(pos);
+                       CL_ParticleEffect(EFFECT_TE_SUPERSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        if (rand() % 5)
                                S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
                        else
@@ -1652,10 +1634,7 @@ void CL_ParseTempEntity(void)
                        // rocket explosion
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 10);
-                       CL_ParticleExplosion(pos);
-                       // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_ParticleEffect(EFFECT_TE_EXPLOSION, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
                        CL_Effect(pos, cl.qw_modelindex_s_explod, 0, 6, 10);
                        break;
@@ -1664,11 +1643,8 @@ void CL_ParseTempEntity(void)
                        // tarbaby explosion
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 10);
-                       CL_BlobExplosion(pos);
-
+                       CL_ParticleEffect(EFFECT_TE_TAREXPLOSION, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
                        break;
 
                case QW_TE_LIGHTNING1:
@@ -1688,14 +1664,12 @@ void CL_ParseTempEntity(void)
 
                case QW_TE_LAVASPLASH:
                        MSG_ReadVector(pos, cls.protocol);
-                       CL_LavaSplash(pos);
+                       CL_ParticleEffect(EFFECT_TE_LAVASPLASH, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                case QW_TE_TELEPORT:
                        MSG_ReadVector(pos, cls.protocol);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 200, 1.0f, 1.0f, 1.0f, 600, 99.0f, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-                       CL_TeleportSplash(pos);
+                       CL_ParticleEffect(EFFECT_TE_TELEPORT, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                case QW_TE_GUNSHOT:
@@ -1703,28 +1677,22 @@ void CL_ParseTempEntity(void)
                        radius = MSG_ReadByte();
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       if (cl_particles_quake.integer)
-                               CL_RunParticleEffect(pos, vec3_origin, 0, 20*radius);
-                       else
-                       {
-                               CL_SparkShower(pos, vec3_origin, 15*radius, 1, radius);
-                               CL_Smoke(pos, vec3_origin, 15*radius, radius);
-                       }
-                       // TODO: scatter bullet marks throughout the sphere?
-                       CL_BulletMark(pos);
+                       VectorSet(pos2, pos[0] + radius, pos[1] + radius, pos[2] + radius);
+                       VectorSet(pos, pos[0] - radius, pos[1] - radius, pos[2] - radius);
+                       CL_ParticleEffect(EFFECT_TE_GUNSHOT, radius, pos, pos2, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                case QW_TE_BLOOD:
                        count = MSG_ReadByte();
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       CL_BloodPuff(pos, vec3_origin, 20*count);
+                       CL_ParticleEffect(EFFECT_TE_BLOOD, count, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                case QW_TE_LIGHTNINGBLOOD:
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       CL_BloodPuff(pos, vec3_origin, 50);
+                       CL_ParticleEffect(EFFECT_TE_BLOOD, 2.5, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                default:
@@ -1740,9 +1708,7 @@ void CL_ParseTempEntity(void)
                        // spike hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       //CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-                       CL_RunParticleEffect(pos, vec3_origin, 20, 30);
+                       CL_ParticleEffect(EFFECT_TE_WIZSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        S_StartSound(-1, 0, cl.sfx_wizhit, pos, 1, 1);
                        break;
 
@@ -1750,9 +1716,7 @@ void CL_ParseTempEntity(void)
                        // spike hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       //CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-                       CL_RunParticleEffect(pos, vec3_origin, 226, 20);
+                       CL_ParticleEffect(EFFECT_TE_KNIGHTSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        S_StartSound(-1, 0, cl.sfx_knighthit, pos, 1, 1);
                        break;
 
@@ -1760,14 +1724,7 @@ void CL_ParseTempEntity(void)
                        // spike hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       if (cl_particles_quake.integer)
-                               CL_RunParticleEffect(pos, vec3_origin, 0, 10);
-                       else if (cl_particles_bulletimpacts.integer)
-                       {
-                               CL_SparkShower(pos, vec3_origin, 15, 1, 0);
-                               CL_Smoke(pos, vec3_origin, 15, 0);
-                       }
-                       CL_BulletMark(pos);
+                       CL_ParticleEffect(EFFECT_TE_SPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        if (rand() % 5)
                                S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
                        else
@@ -1785,16 +1742,7 @@ void CL_ParseTempEntity(void)
                        // quad spike hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       if (cl_particles_quake.integer)
-                               CL_RunParticleEffect(pos, vec3_origin, 0, 10);
-                       else if (cl_particles_bulletimpacts.integer)
-                       {
-                               CL_SparkShower(pos, vec3_origin, 15, 1, 0);
-                               CL_Smoke(pos, vec3_origin, 15, 0);
-                       }
-                       CL_BulletMark(pos);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_ParticleEffect(EFFECT_TE_SPIKEQUAD, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        if (rand() % 5)
                                S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
                        else
@@ -1812,14 +1760,7 @@ void CL_ParseTempEntity(void)
                        // super spike hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       if (cl_particles_quake.integer)
-                               CL_RunParticleEffect(pos, vec3_origin, 0, 20);
-                       else if (cl_particles_bulletimpacts.integer)
-                       {
-                               CL_SparkShower(pos, vec3_origin, 30, 1, 0);
-                               CL_Smoke(pos, vec3_origin, 30, 0);
-                       }
-                       CL_BulletMark(pos);
+                       CL_ParticleEffect(EFFECT_TE_SUPERSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        if (rand() % 5)
                                S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
                        else
@@ -1837,16 +1778,7 @@ void CL_ParseTempEntity(void)
                        // quad super spike hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       if (cl_particles_quake.integer)
-                               CL_RunParticleEffect(pos, vec3_origin, 0, 20);
-                       else if (cl_particles_bulletimpacts.integer)
-                       {
-                               CL_SparkShower(pos, vec3_origin, 30, 1, 0);
-                               CL_Smoke(pos, vec3_origin, 30, 0);
-                       }
-                       CL_BulletMark(pos);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_ParticleEffect(EFFECT_TE_SUPERSPIKEQUAD, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        if (rand() % 5)
                                S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
                        else
@@ -1869,7 +1801,7 @@ void CL_ParseTempEntity(void)
                        dir[1] = MSG_ReadChar();
                        dir[2] = MSG_ReadChar();
                        count = MSG_ReadByte();
-                       CL_BloodPuff(pos, dir, count);
+                       CL_ParticleEffect(EFFECT_TE_BLOOD, count, pos, pos, dir, dir, NULL, 0);
                        break;
                case TE_SPARK:
                        // spark shower
@@ -1879,14 +1811,12 @@ void CL_ParseTempEntity(void)
                        dir[1] = MSG_ReadChar();
                        dir[2] = MSG_ReadChar();
                        count = MSG_ReadByte();
-                       CL_SparkShower(pos, dir, count, 1, 0);
+                       CL_ParticleEffect(EFFECT_TE_SPARK, count, pos, pos, dir, dir, NULL, 0);
                        break;
                case TE_PLASMABURN:
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 200, 1, 1, 1, 1000, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-                       CL_PlasmaBurn(pos);
+                       CL_ParticleEffect(EFFECT_TE_PLASMABURN, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
                        // LordHavoc: added for improved gore
                case TE_BLOODSHOWER:
@@ -1895,8 +1825,15 @@ void CL_ParseTempEntity(void)
                        MSG_ReadVector(pos2, cls.protocol); // maxs
                        velspeed = MSG_ReadCoord(cls.protocol); // speed
                        count = (unsigned short) MSG_ReadShort(); // number of particles
-                       CL_BloodShower(pos, pos2, velspeed, count);
+                       vel1[0] = -velspeed;
+                       vel1[1] = -velspeed;
+                       vel1[2] = -velspeed;
+                       vel2[0] = velspeed;
+                       vel2[1] = velspeed;
+                       vel2[2] = velspeed;
+                       CL_ParticleEffect(EFFECT_TE_BLOOD, count, pos, pos2, vel1, vel2, NULL, 0);
                        break;
+
                case TE_PARTICLECUBE:
                        // general purpose particle effect
                        MSG_ReadVector(pos, cls.protocol); // mins
@@ -1933,40 +1870,21 @@ void CL_ParseTempEntity(void)
                        // bullet hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       if (cl_particles_quake.integer)
-                               CL_RunParticleEffect(pos, vec3_origin, 0, 20);
-                       else
-                       {
-                               CL_SparkShower(pos, vec3_origin, 15, 1, 0);
-                               CL_Smoke(pos, vec3_origin, 15, 0);
-                       }
-                       CL_BulletMark(pos);
+                       CL_ParticleEffect(EFFECT_TE_GUNSHOT, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                case TE_GUNSHOTQUAD:
                        // quad bullet hitting wall
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       if (cl_particles_quake.integer)
-                               CL_RunParticleEffect(pos, vec3_origin, 0, 20);
-                       else
-                       {
-                               CL_SparkShower(pos, vec3_origin, 15, 1, 0);
-                               CL_Smoke(pos, vec3_origin, 15, 0);
-                       }
-                       CL_BulletMark(pos);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_ParticleEffect(EFFECT_TE_GUNSHOTQUAD, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                case TE_EXPLOSION:
                        // rocket explosion
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 10);
-                       CL_ParticleExplosion(pos);
-                       // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_ParticleEffect(EFFECT_TE_EXPLOSION, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
                        break;
 
@@ -1974,9 +1892,7 @@ void CL_ParseTempEntity(void)
                        // quad rocket explosion
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 10);
-                       CL_ParticleExplosion(pos);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_ParticleEffect(EFFECT_TE_EXPLOSIONQUAD, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
                        break;
 
@@ -1984,11 +1900,11 @@ void CL_ParseTempEntity(void)
                        // Nehahra movie colored lighting explosion
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 10);
-                       CL_ParticleExplosion(pos);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
                        color[0] = MSG_ReadCoord(cls.protocol) * (2.0f / 1.0f);
                        color[1] = MSG_ReadCoord(cls.protocol) * (2.0f / 1.0f);
                        color[2] = MSG_ReadCoord(cls.protocol) * (2.0f / 1.0f);
+                       CL_ParticleExplosion(pos);
+                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
                        CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
                        S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
                        break;
@@ -2010,18 +1926,14 @@ void CL_ParseTempEntity(void)
                        // tarbaby explosion
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 10);
-                       CL_BlobExplosion(pos);
-
+                       CL_ParticleEffect(EFFECT_TE_TAREXPLOSION, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
                        break;
 
                case TE_SMALLFLASH:
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 10);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 200, 2, 2, 2, 1000, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_ParticleEffect(EFFECT_TE_SMALLFLASH, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                case TE_CUSTOMFLASH:
@@ -2040,7 +1952,7 @@ void CL_ParseTempEntity(void)
                        MSG_ReadVector(pos, cls.protocol);
                        MSG_ReadVector(dir, cls.protocol);
                        count = MSG_ReadByte();
-                       CL_Flames(pos, dir, count);
+                       CL_ParticleEffect(EFFECT_TE_FLAMEJET, count, pos, pos, dir, dir, NULL, 0);
                        break;
 
                case TE_LIGHTNING1:
@@ -2072,14 +1984,12 @@ void CL_ParseTempEntity(void)
 
                case TE_LAVASPLASH:
                        MSG_ReadVector(pos, cls.protocol);
-                       CL_LavaSplash(pos);
+                       CL_ParticleEffect(EFFECT_TE_LAVASPLASH, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                case TE_TELEPORT:
                        MSG_ReadVector(pos, cls.protocol);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 200, 1.0f, 1.0f, 1.0f, 600, 99.0f, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-                       CL_TeleportSplash(pos);
+                       CL_ParticleEffect(EFFECT_TE_TELEPORT, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                case TE_EXPLOSION2:
@@ -2102,7 +2012,7 @@ void CL_ParseTempEntity(void)
                        MSG_ReadVector(pos, cls.protocol);
                        MSG_ReadVector(pos2, cls.protocol);
                        MSG_ReadVector(dir, cls.protocol);
-                       CL_BeamParticle(pos, pos2, 8, 1, 1, 1, 1, 1);
+                       CL_ParticleEffect(EFFECT_TE_TEI_G3, 1, pos, pos2, dir, dir, NULL, 0);
                        break;
 
                case TE_TEI_SMOKE:
@@ -2110,15 +2020,13 @@ void CL_ParseTempEntity(void)
                        MSG_ReadVector(dir, cls.protocol);
                        count = MSG_ReadByte();
                        CL_FindNonSolidLocation(pos, pos, 4);
-                       CL_Tei_Smoke(pos, dir, count);
+                       CL_ParticleEffect(EFFECT_TE_TEI_SMOKE, count, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                case TE_TEI_BIGEXPLOSION:
                        MSG_ReadVector(pos, cls.protocol);
                        CL_FindNonSolidLocation(pos, pos, 10);
-                       CL_ParticleExplosion(pos);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_ParticleEffect(EFFECT_TE_TEI_BIGEXPLOSION, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
                        break;
 
@@ -2127,9 +2035,7 @@ void CL_ParseTempEntity(void)
                        MSG_ReadVector(dir, cls.protocol);
                        count = MSG_ReadByte();
                        CL_FindNonSolidLocation(pos, pos, 5);
-                       CL_Tei_PlasmaHit(pos, dir, count);
-                       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-                       CL_AllocDlight(NULL, &tempmatrix, 500, 0.6, 1.2, 2.0f, 2000, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       CL_ParticleEffect(EFFECT_TE_TEI_PLASMAHIT, count, pos, pos, vec3_origin, vec3_origin, NULL, 0);
                        break;
 
                default:
index 202f32e..85a965b 100644 (file)
@@ -40,6 +40,80 @@ particletype_t particletype[pt_total] =
        {PBLEND_ALPHA, PARTICLE_BILLBOARD, false}, //pt_entityparticle
 };
 
+#define PARTICLEEFFECT_UNDERWATER 1
+#define PARTICLEEFFECT_NOTUNDERWATER 2
+
+typedef struct particleeffectinfo_s
+{
+       int effectnameindex; // which effect this belongs to
+       // PARTICLEEFFECT_* bits
+       int flags;
+       // blood effects may spawn very few particles, so proper fraction-overflow
+       // handling is very important, this variable keeps track of the fraction
+       double particleaccumulator;
+       // the math is: countabsolute + requestedcount * countmultiplier * quality
+       // absolute number of particles to spawn, often used for decals
+       // (unaffected by quality and requestedcount)
+       float countabsolute;
+       // multiplier for the number of particles CL_ParticleEffect was told to
+       // spawn, most effects do not really have a count and hence use 1, so
+       // this is often the actual count to spawn, not merely a multiplier
+       float countmultiplier;
+       // if > 0 this causes the particle to spawn in an evenly spaced line from
+       // originmins to originmaxs (causing them to describe a trail, not a box)
+       float trailspacing;
+       // type of particle to spawn (defines some aspects of behavior)
+       ptype_t particletype;
+       // range of colors to choose from in hex RRGGBB (like HTML color tags),
+       // randomly interpolated at spawn
+       unsigned int color[2];
+       // a random texture is chosen in this range (note the second value is one
+       // past the last choosable, so for example 8,16 chooses any from 8 up and
+       // including 15)
+       // if start and end of the range are the same, no randomization is done
+       int tex[2];
+       // range of size values randomly chosen when spawning
+       float size[2];
+       // range of alpha values randomly chosen when spawning, plus alpha fade
+       float alpha[3];
+       // how long the particle should live (note it is also removed if alpha drops to 0)
+       float time[2];
+       // how much gravity affects this particle (negative makes it fly up!)
+       float gravity;
+       // how much bounce the particle has when it hits a surface
+       // if negative the particle is removed on impact
+       float bounce;
+       // if in air this friction is applied
+       // if negative the particle accelerates
+       float airfriction;
+       // if in liquid (water/slime/lava) this friction is applied
+       // if negative the particle accelerates
+       float liquidfriction;
+       // these offsets are added to the values given to particleeffect(), and
+       // then an ellipsoid-shaped jitter is added as defined by these
+       // (they are the 3 radii)
+       float originoffset[3];
+       float velocityoffset[3];
+       float originjitter[3];
+       float velocityjitter[3];
+       float velocitymultiplier;
+       // an effect can also spawn a dlight
+       float lightradiusstart;
+       float lightradiusfade;
+       float lighttime;
+       float lightcolor[3];
+       float lightshadow;
+       float lightcubemapnum;
+}
+particleeffectinfo_t;
+
+#define MAX_PARTICLEEFFECTNAME 256
+char particleeffectname[MAX_PARTICLEEFFECTNAME][64];
+
+#define MAX_PARTICLEEFFECTINFO 4096
+
+particleeffectinfo_t particleeffectinfo[MAX_PARTICLEEFFECTINFO];
+
 static int particlepalette[256] =
 {
        0x000000,0x0f0f0f,0x1f1f1f,0x2f2f2f,0x3f3f3f,0x4b4b4b,0x5b5b5b,0x6b6b6b, // 0-7
@@ -97,12 +171,10 @@ cvar_t cl_particles = {CVAR_SAVE, "cl_particles", "1", "enables particle effects
 cvar_t cl_particles_quality = {CVAR_SAVE, "cl_particles_quality", "1", "multiplies number of particles and reduces their alpha"};
 cvar_t cl_particles_size = {CVAR_SAVE, "cl_particles_size", "1", "multiplies particle size"};
 cvar_t cl_particles_quake = {CVAR_SAVE, "cl_particles_quake", "0", "makes particle effects look mostly like the ones in Quake"};
-cvar_t cl_particles_bloodshowers = {CVAR_SAVE, "cl_particles_bloodshowers", "1", "enables blood shower effects"};
 cvar_t cl_particles_blood = {CVAR_SAVE, "cl_particles_blood", "1", "enables blood effects"};
 cvar_t cl_particles_blood_alpha = {CVAR_SAVE, "cl_particles_blood_alpha", "0.5", "opacity of blood"};
 cvar_t cl_particles_blood_bloodhack = {CVAR_SAVE, "cl_particles_blood_bloodhack", "1", "make certain quake particle() calls create blood effects instead"};
 cvar_t cl_particles_bulletimpacts = {CVAR_SAVE, "cl_particles_bulletimpacts", "1", "enables bulletimpact effects"};
-cvar_t cl_particles_explosions_bubbles = {CVAR_SAVE, "cl_particles_explosions_bubbles", "1", "enables bubbles from underwater explosions"};
 cvar_t cl_particles_explosions_smoke = {CVAR_SAVE, "cl_particles_explosions_smokes", "0", "enables smoke from explosions"};
 cvar_t cl_particles_explosions_sparks = {CVAR_SAVE, "cl_particles_explosions_sparks", "1", "enables sparks from explosions"};
 cvar_t cl_particles_explosions_shell = {CVAR_SAVE, "cl_particles_explosions_shell", "0", "enables polygonal shell from explosions"};
@@ -115,6 +187,220 @@ cvar_t cl_decals = {CVAR_SAVE, "cl_decals", "0", "enables decals (bullet holes,
 cvar_t cl_decals_time = {CVAR_SAVE, "cl_decals_time", "0", "how long before decals start to fade away"};
 cvar_t cl_decals_fadetime = {CVAR_SAVE, "cl_decals_fadetime", "20", "how long decals take to fade away"};
 
+
+void CL_Particles_ParseEffectInfo(const char *textstart, const char *textend)
+{
+       int arrayindex;
+       int argc;
+       int effectinfoindex;
+       int linenumber;
+       particleeffectinfo_t *info = NULL;
+       const char *text = textstart;
+       char argv[16][1024];
+       effectinfoindex = -1;
+       for (linenumber = 1;;linenumber++)
+       {
+               argc = 0;
+               for (arrayindex = 0;arrayindex < 16;arrayindex++)
+                       argv[arrayindex][0] = 0;
+               for (;;)
+               {
+                       if (!COM_ParseToken(&text, true))
+                               return;
+                       if (!strcmp(com_token, "\n"))
+                               break;
+                       if (argc < 16)
+                       {
+                               strlcpy(argv[argc], com_token, sizeof(argv[argc]));
+                               argc++;
+                       }
+               }
+               if (argc < 1)
+                       continue;
+#define checkparms(n) if (argc != (n)) {Con_Printf("effectinfo.txt:%i: error while parsing: %s given %i parameters, should be %i parameters\n", linenumber, argv[0], argc, (n));break;}
+#define readints(array, n) checkparms(n+1);for (arrayindex = 0;arrayindex < argc - 1;arrayindex++) array[arrayindex] = (int)atof(argv[1+arrayindex])
+#define readfloats(array, n) checkparms(n+1);for (arrayindex = 0;arrayindex < argc - 1;arrayindex++) array[arrayindex] = atof(argv[1+arrayindex])
+#define readint(var) checkparms(2);var = (int)atof(argv[1])
+#define readfloat(var) checkparms(2);var = atof(argv[1])
+               if (!strcmp(argv[0], "effect"))
+               {
+                       int effectnameindex;
+                       checkparms(2);
+                       effectinfoindex++;
+                       if (effectinfoindex >= MAX_PARTICLEEFFECTINFO)
+                       {
+                               Con_Printf("effectinfo.txt:%i: too many effects!\n", linenumber);
+                               break;
+                       }
+                       for (effectnameindex = 1;effectnameindex < MAX_PARTICLEEFFECTNAME;effectnameindex++)
+                       {
+                               if (particleeffectname[effectnameindex][0])
+                               {
+                                       if (!strcmp(particleeffectname[effectnameindex], argv[1]))
+                                               break;
+                               }
+                               else
+                               {
+                                       strlcpy(particleeffectname[effectnameindex], argv[1], sizeof(particleeffectname[effectnameindex]));
+                                       break;
+                               }
+                       }
+                       // if we run out of names, abort
+                       if (effectnameindex == MAX_PARTICLEEFFECTNAME)
+                       {
+                               Con_Printf("effectinfo.txt:%i: too many effects!\n", linenumber);
+                               break;
+                       }
+                       info = particleeffectinfo + effectinfoindex;
+                       info->effectnameindex = effectnameindex;
+                       info->particletype = pt_alphastatic;
+                       info->tex[0] = tex_particle;
+                       info->tex[1] = tex_particle;
+                       info->color[0] = 0xFFFFFF;
+                       info->color[1] = 0xFFFFFF;
+                       info->size[0] = 1;
+                       info->size[1] = 1;
+                       info->alpha[0] = 0;
+                       info->alpha[1] = 256;
+                       info->alpha[2] = 256;
+                       info->time[0] = 9999;
+                       info->time[1] = 9999;
+                       VectorSet(info->lightcolor, 1, 1, 1);
+                       info->lightshadow = true;
+                       info->lighttime = 9999;
+               }
+               else if (info == NULL)
+               {
+                       Con_Printf("effectinfo.txt:%i: command %s encountered before effect\n", linenumber, argv[0]);
+                       break;
+               }
+               else if (!strcmp(argv[0], "countabsolute")) {readfloat(info->countabsolute);}
+               else if (!strcmp(argv[0], "count")) {readfloat(info->countmultiplier);}
+               else if (!strcmp(argv[0], "type"))
+               {
+                       checkparms(2);
+                       if (!strcmp(argv[1], "alphastatic")) info->particletype = pt_alphastatic;
+                       else if (!strcmp(argv[1], "static")) info->particletype = pt_static;
+                       else if (!strcmp(argv[1], "spark")) info->particletype = pt_spark;
+                       else if (!strcmp(argv[1], "beam")) info->particletype = pt_beam;
+                       else if (!strcmp(argv[1], "rain")) info->particletype = pt_rain;
+                       else if (!strcmp(argv[1], "raindecal")) info->particletype = pt_raindecal;
+                       else if (!strcmp(argv[1], "snow")) info->particletype = pt_snow;
+                       else if (!strcmp(argv[1], "bubble")) info->particletype = pt_bubble;
+                       else if (!strcmp(argv[1], "blood")) info->particletype = pt_blood;
+                       else if (!strcmp(argv[1], "smoke")) info->particletype = pt_smoke;
+                       else if (!strcmp(argv[1], "decal")) info->particletype = pt_decal;
+                       else if (!strcmp(argv[1], "entityparticle")) info->particletype = pt_entityparticle;
+                       else Con_Printf("effectinfo.txt:%i: unrecognized particle type %s\n", linenumber, argv[1]);
+               }
+               else if (!strcmp(argv[0], "color")) {readints(info->color, 2);}
+               else if (!strcmp(argv[0], "tex")) {readints(info->tex, 2);}
+               else if (!strcmp(argv[0], "size")) {readfloats(info->size, 2);}
+               else if (!strcmp(argv[0], "alpha")) {readfloats(info->alpha, 3);}
+               else if (!strcmp(argv[0], "time")) {readints(info->time, 2);}
+               else if (!strcmp(argv[0], "gravity")) {readfloat(info->gravity);}
+               else if (!strcmp(argv[0], "bounce")) {readfloat(info->bounce);}
+               else if (!strcmp(argv[0], "airfriction")) {readfloat(info->airfriction);}
+               else if (!strcmp(argv[0], "liquidfriction")) {readfloat(info->liquidfriction);}
+               else if (!strcmp(argv[0], "originoffset")) {readfloats(info->originoffset, 3);}
+               else if (!strcmp(argv[0], "velocityoffset")) {readfloats(info->velocityoffset, 3);}
+               else if (!strcmp(argv[0], "originjitter")) {readfloats(info->originjitter, 3);}
+               else if (!strcmp(argv[0], "velocityjitter")) {readfloats(info->velocityjitter, 3);}
+               else if (!strcmp(argv[0], "velocitymultiplier")) {readfloat(info->velocitymultiplier);}
+               else if (!strcmp(argv[0], "lightradius")) {readfloat(info->lightradiusstart);}
+               else if (!strcmp(argv[0], "lightradiusfade")) {readfloat(info->lightradiusfade);}
+               else if (!strcmp(argv[0], "lighttime")) {readfloat(info->lighttime);}
+               else if (!strcmp(argv[0], "lightcolor")) {readfloats(info->lightcolor, 3);}
+               else if (!strcmp(argv[0], "lightshadow")) {readint(info->lightshadow);}
+               else if (!strcmp(argv[0], "lightcubemapnum")) {readint(info->lightcubemapnum);}
+               else if (!strcmp(argv[0], "underwater")) {checkparms(1);info->flags |= PARTICLEEFFECT_UNDERWATER;}
+               else if (!strcmp(argv[0], "notunderwater")) {checkparms(1);info->flags |= PARTICLEEFFECT_NOTUNDERWATER;}
+               else if (!strcmp(argv[0], "trailspacing")) {readfloat(info->trailspacing);if (info->trailspacing > 0) info->countmultiplier = 1.0f / info->trailspacing;}
+               else
+                       Con_Printf("effectinfo.txt:%i: skipping unknown command %s\n", linenumber, argv[0]);
+#undef checkparms
+#undef readints
+#undef readfloats
+#undef readint
+#undef readfloat
+       }
+}
+
+int CL_ParticleEffectIndexForName(const char *name)
+{
+       int i;
+       for (i = 1;i < MAX_PARTICLEEFFECTNAME && particleeffectname[i][0];i++)
+               if (!strcmp(particleeffectname[i], name))
+                       return i;
+       return 0;
+}
+
+const char *CL_ParticleEffectNameForIndex(int i)
+{
+       if (i < 1 || i >= MAX_PARTICLEEFFECTNAME)
+               return NULL;
+       return particleeffectname[i];
+}
+
+// MUST match effectnameindex_t in client.h
+static const char *standardeffectnames[EFFECT_TOTAL] =
+{
+       "",
+       "TE_GUNSHOT",
+       "TE_GUNSHOTQUAD",
+       "TE_SPIKE",
+       "TE_SPIKEQUAD",
+       "TE_SUPERSPIKE",
+       "TE_SUPERSPIKEQUAD",
+       "TE_WIZSPIKE",
+       "TE_KNIGHTSPIKE",
+       "TE_VORESPIKE",
+       "TE_EXPLOSION",
+       "TE_EXPLOSIONQUAD",
+       "TE_TAREXPLOSION",
+       "TE_TELEPORT",
+       "TE_LAVASPLASH",
+       "TE_SMALLFLASH",
+       "TE_FLAMEJET",
+       "EF_FLAME",
+       "TE_BLOOD",
+       "TE_SPARK",
+       "TE_PLASMABURN",
+       "TE_TEI_G3",
+       "TE_TEI_SMOKE",
+       "TE_TEI_BIGEXPLOSION",
+       "TE_TEI_PLASMAHIT",
+       "EF_STARDUST",
+       "TR_ROCKET",
+       "TR_GRENADE",
+       "TR_BLOOD",
+       "TR_WIZSPIKE",
+       "TR_SLIGHTBLOOD",
+       "TR_KNIGHTSPIKE",
+       "TR_VORESPIKE",
+       "TR_NEHAHRASMOKE",
+       "TR_NEXUIZPLASMA",
+       "TR_GLOWTRAIL",
+       "SVC_PARTICLE"
+};
+
+void CL_Particles_LoadEffectInfo(void)
+{
+       int i;
+       unsigned char *filedata;
+       fs_offset_t filesize;
+       memset(particleeffectinfo, 0, sizeof(particleeffectinfo));
+       memset(particleeffectname, 0, sizeof(particleeffectname));
+       for (i = 0;i < EFFECT_TOTAL;i++)
+               strlcpy(particleeffectname[i], standardeffectnames[i], sizeof(particleeffectname[i]));
+       filedata = FS_LoadFile("effectinfo.txt", tempmempool, true, &filesize);
+       if (filedata)
+       {
+               CL_Particles_ParseEffectInfo((const char *)filedata, (const char *)filedata + filesize);
+               Mem_Free(filedata);
+       }
+};
+
 /*
 ===============
 CL_InitParticles
@@ -124,16 +410,15 @@ void CL_ReadPointFile_f (void);
 void CL_Particles_Init (void)
 {
        Cmd_AddCommand ("pointfile", CL_ReadPointFile_f, "display point file produced by qbsp when a leak was detected in the map (a line leading through the leak hole, to an entity inside the level)");
+       Cmd_AddCommand ("cl_particles_reloadeffects", CL_Particles_LoadEffectInfo, "reloads effectinfo.txt");
 
        Cvar_RegisterVariable (&cl_particles);
        Cvar_RegisterVariable (&cl_particles_quality);
        Cvar_RegisterVariable (&cl_particles_size);
        Cvar_RegisterVariable (&cl_particles_quake);
-       Cvar_RegisterVariable (&cl_particles_bloodshowers);
        Cvar_RegisterVariable (&cl_particles_blood);
        Cvar_RegisterVariable (&cl_particles_blood_alpha);
        Cvar_RegisterVariable (&cl_particles_blood_bloodhack);
-       Cvar_RegisterVariable (&cl_particles_explosions_bubbles);
        Cvar_RegisterVariable (&cl_particles_explosions_smoke);
        Cvar_RegisterVariable (&cl_particles_explosions_sparks);
        Cvar_RegisterVariable (&cl_particles_explosions_shell);
@@ -165,7 +450,7 @@ void CL_Particles_Shutdown (void)
 // px,py,pz - starting origin of particle
 // pvx,pvy,pvz - starting velocity of particle
 // pfriction - how much the particle slows down per second (0-1 typically, can slowdown faster than 1)
-particle_t *particle(particletype_t *ptype, int pcolor1, int pcolor2, int ptex, float psize, float palpha, float palphafade, float pgravity, float pbounce, float px, float py, float pz, float pvx, float pvy, float pvz, float pfriction, float originjitter, float velocityjitter)
+static particle_t *particle(particletype_t *ptype, int pcolor1, int pcolor2, int ptex, float psize, float palpha, float palphafade, float pgravity, float pbounce, float px, float py, float pz, float pvx, float pvy, float pvz, float pfriction, float originjitter, float velocityjitter)
 {
        int l1, l2;
        particle_t *part;
@@ -246,435 +531,800 @@ void CL_SpawnDecalParticleForPoint(const vec3_t org, float maxdist, float size,
                CL_SpawnDecalParticleForSurface(besthitent, bestorg, bestnormal, color1, color2, texnum, size, alpha);
 }
 
-/*
-===============
-CL_EntityParticles
-===============
-*/
-void CL_EntityParticles (entity_t *ent)
+static void CL_Sparks(const vec3_t originmins, const vec3_t originmaxs, const vec3_t velocitymins, const vec3_t velocitymaxs, float sparkcount, float smokecount);
+void CL_ParticleEffect_Fallback(int effectnameindex, float count, const vec3_t originmins, const vec3_t originmaxs, const vec3_t velocitymins, const vec3_t velocitymaxs, entity_t *ent, int palettecolor)
 {
-       int i;
-       float pitch, yaw, dist = 64, beamlength = 16, org[3], v[3];
-       static vec3_t avelocities[NUMVERTEXNORMALS];
-       if (!cl_particles.integer) return;
-
-       Matrix4x4_OriginFromMatrix(&ent->render.matrix, org);
-
-       if (!avelocities[0][0])
-               for (i = 0;i < NUMVERTEXNORMALS * 3;i++)
-                       avelocities[0][i] = lhrandom(0, 2.55);
-
-       for (i = 0;i < NUMVERTEXNORMALS;i++)
+       vec3_t center;
+       matrix4x4_t tempmatrix;
+       VectorLerp(originmins, 0.5, originmaxs, center);
+       Matrix4x4_CreateTranslate(&tempmatrix, center[0], center[1], center[2]);
+       if (effectnameindex == EFFECT_TE_WIZSPIKE)
+               CL_ParticleEffect(EFFECT_SVC_PARTICLE, 30*count, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 20);
+       else if (effectnameindex == EFFECT_TE_KNIGHTSPIKE)
+               CL_ParticleEffect(EFFECT_SVC_PARTICLE, 20*count, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 226);
+       else if (effectnameindex == EFFECT_TE_SPIKE)
        {
-               yaw = cl.time * avelocities[i][0];
-               pitch = cl.time * avelocities[i][1];
-               v[0] = org[0] + m_bytenormals[i][0] * dist + (cos(pitch)*cos(yaw)) * beamlength;
-               v[1] = org[1] + m_bytenormals[i][1] * dist + (cos(pitch)*sin(yaw)) * beamlength;
-               v[2] = org[2] + m_bytenormals[i][2] * dist + (-sin(pitch)) * beamlength;
-               particle(particletype + pt_entityparticle, particlepalette[0x6f], particlepalette[0x6f], tex_particle, 1, 255, 0, 0, 0, v[0], v[1], v[2], 0, 0, 0, 0, 0, 0);
+               if (cl_particles_bulletimpacts.integer)
+               {
+                       if (cl_particles_quake.integer)
+                       {
+                               if (cl_particles_smoke.integer)
+                                       CL_ParticleEffect(EFFECT_SVC_PARTICLE, 10*count, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 0);
+                       }
+                       else
+                               CL_Sparks(originmins, originmaxs, velocitymins, velocitymaxs, 15*count, 4*count);
+               }
+               // bullet hole
+               if (cl_stainmaps.integer) R_Stain(center, 32, 96, 96, 96, 24, 128, 128, 128, 24);
+               CL_SpawnDecalParticleForPoint(center, 6, 3, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
        }
-}
-
-
-void CL_ReadPointFile_f (void)
-{
-       vec3_t org, leakorg;
-       int r, c, s;
-       char *pointfile = NULL, *pointfilepos, *t, tchar;
-       char name[MAX_OSPATH];
-
-       if (!cl.worldmodel)
-               return;
-
-       FS_StripExtension (cl.worldmodel->name, name, sizeof (name));
-       strlcat (name, ".pts", sizeof (name));
-       pointfile = (char *)FS_LoadFile(name, tempmempool, true, NULL);
-       if (!pointfile)
+       else if (effectnameindex == EFFECT_TE_SPIKEQUAD)
        {
-               Con_Printf("Could not open %s\n", name);
-               return;
+               if (cl_particles_bulletimpacts.integer)
+               {
+                       if (cl_particles_quake.integer)
+                       {
+                               if (cl_particles_smoke.integer)
+                                       CL_ParticleEffect(EFFECT_SVC_PARTICLE, 10*count, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 0);
+                       }
+                       else
+                               CL_Sparks(originmins, originmaxs, velocitymins, velocitymaxs, 15*count, 4*count);
+               }
+               // bullet hole
+               if (cl_stainmaps.integer) R_Stain(center, 32, 96, 96, 96, 24, 128, 128, 128, 24);
+               CL_SpawnDecalParticleForPoint(center, 6, 3, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
+               CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
        }
-
-       Con_Printf("Reading %s...\n", name);
-       VectorClear(leakorg);
-       c = 0;
-       s = 0;
-       pointfilepos = pointfile;
-       while (*pointfilepos)
+       else if (effectnameindex == EFFECT_TE_SUPERSPIKE)
        {
-               while (*pointfilepos == '\n' || *pointfilepos == '\r')
-                       pointfilepos++;
-               if (!*pointfilepos)
-                       break;
-               t = pointfilepos;
-               while (*t && *t != '\n' && *t != '\r')
-                       t++;
-               tchar = *t;
-               *t = 0;
-               r = sscanf (pointfilepos,"%f %f %f", &org[0], &org[1], &org[2]);
-               *t = tchar;
-               pointfilepos = t;
-               if (r != 3)
-                       break;
-               if (c == 0)
-                       VectorCopy(org, leakorg);
-               c++;
-
-               if (cl.num_particles < cl.max_particles - 3)
+               if (cl_particles_bulletimpacts.integer)
                {
-                       s++;
-                       particle(particletype + pt_static, particlepalette[(-c)&15], particlepalette[(-c)&15], tex_particle, 2, 255, 0, 0, 0, org[0], org[1], org[2], 0, 0, 0, 0, 0, 0);
+                       if (cl_particles_quake.integer)
+                       {
+                               if (cl_particles_smoke.integer)
+                                       CL_ParticleEffect(EFFECT_SVC_PARTICLE, 20*count, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 0);
+                       }
+                       else
+                               CL_Sparks(originmins, originmaxs, velocitymins, velocitymaxs, 30*count, 8*count);
                }
+               // bullet hole
+               if (cl_stainmaps.integer) R_Stain(center, 32, 96, 96, 96, 24, 128, 128, 128, 24);
+               CL_SpawnDecalParticleForPoint(center, 6, 3, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
        }
-       Mem_Free(pointfile);
-       VectorCopy(leakorg, org);
-       Con_Printf("%i points read (%i particles spawned)\nLeak at %f %f %f\n", c, s, org[0], org[1], org[2]);
-
-       particle(particletype + pt_beam, 0xFF0000, 0xFF0000, tex_beam, 64, 255, 0, 0, 0, org[0] - 4096, org[1], org[2], org[0] + 4096, org[1], org[2], 0, 0, 0);
-       particle(particletype + pt_beam, 0x00FF00, 0x00FF00, tex_beam, 64, 255, 0, 0, 0, org[0], org[1] - 4096, org[2], org[0], org[1] + 4096, org[2], 0, 0, 0);
-       particle(particletype + pt_beam, 0x0000FF, 0x0000FF, tex_beam, 64, 255, 0, 0, 0, org[0], org[1], org[2] - 4096, org[0], org[1], org[2] + 4096, 0, 0, 0);
-}
-
-/*
-===============
-CL_ParseParticleEffect
-
-Parse an effect out of the server message
-===============
-*/
-void CL_ParseParticleEffect (void)
-{
-       vec3_t org, dir;
-       int i, count, msgcount, color;
-
-       MSG_ReadVector(org, cls.protocol);
-       for (i=0 ; i<3 ; i++)
-               dir[i] = MSG_ReadChar ();
-       msgcount = MSG_ReadByte ();
-       color = MSG_ReadByte ();
-
-       if (msgcount == 255)
-               count = 1024;
-       else
-               count = msgcount;
-
-       if (cl_particles_blood_bloodhack.integer && !cl_particles_quake.integer)
+       else if (effectnameindex == EFFECT_TE_SUPERSPIKEQUAD)
        {
-               if (color == 73)
+               if (cl_particles_bulletimpacts.integer)
                {
-                       // regular blood
-                       CL_BloodPuff(org, dir, count / 2);
-                       return;
+                       if (cl_particles_quake.integer)
+                       {
+                               if (cl_particles_smoke.integer)
+                                       CL_ParticleEffect(EFFECT_SVC_PARTICLE, 20*count, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 0);
+                       }
+                       else
+                               CL_Sparks(originmins, originmaxs, velocitymins, velocitymaxs, 30*count, 8*count);
                }
-               if (color == 225)
-               {
-                       // lightning blood
-                       CL_BloodPuff(org, dir, count / 2);
+               // bullet hole
+               if (cl_stainmaps.integer) R_Stain(center, 32, 96, 96, 96, 24, 128, 128, 128, 24);
+               CL_SpawnDecalParticleForPoint(center, 6, 3, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
+               CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       }
+       else if (effectnameindex == EFFECT_TE_BLOOD)
+       {
+               if (!cl_particles_blood.integer)
                        return;
+               if (cl_particles_quake.integer)
+                       CL_ParticleEffect(EFFECT_SVC_PARTICLE, 20*count, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 73);
+               else
+               {
+                       static double bloodaccumulator = 0;
+                       bloodaccumulator += count * 0.333 * cl_particles_quality.value;
+                       for (;bloodaccumulator > 0;bloodaccumulator--)
+                               particle(particletype + pt_blood, 0xFFFFFF, 0xFFFFFF, tex_bloodparticle[rand()&7], 8, cl_particles_blood_alpha.value * 768, cl_particles_blood_alpha.value * 384, 0, -1, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 1, 0, 64);
                }
        }
-       CL_RunParticleEffect (org, dir, color, count);
-}
-
-/*
-===============
-CL_ParticleExplosion
-
-===============
-*/
-void CL_ParticleExplosion (vec3_t org)
-{
-       int i;
-       trace_t trace;
-       //vec3_t v;
-       //vec3_t v2;
-       if (cl_stainmaps.integer)
-               R_Stain(org, 96, 80, 80, 80, 64, 176, 176, 176, 64);
-       CL_SpawnDecalParticleForPoint(org, 40, 48, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
-
-       if (cl_particles_quake.integer)
+       else if (effectnameindex == EFFECT_TE_SPARK)
+               CL_Sparks(originmins, originmaxs, velocitymins, velocitymaxs, count, 0);
+       else if (effectnameindex == EFFECT_TE_PLASMABURN)
        {
-               for (i = 0;i < 1024;i++)
+               // plasma scorch mark
+               if (cl_stainmaps.integer) R_Stain(center, 48, 96, 96, 96, 32, 128, 128, 128, 32);
+               CL_SpawnDecalParticleForPoint(center, 6, 6, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
+               CL_AllocDlight(NULL, &tempmatrix, 200, 1, 1, 1, 1000, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       }
+       else if (effectnameindex == EFFECT_TE_GUNSHOT)
+       {
+               if (cl_particles_bulletimpacts.integer)
                {
-                       int r, color;
-                       r = rand()&3;
-                       if (i & 1)
-                       {
-                               color = particlepalette[ramp1[r]];
-                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 32 * (8 - r), 318, 0, 0, org[0], org[1], org[2], 0, 0, 0, -4, 16, 256);
-                       }
+                       if (cl_particles_quake.integer)
+                               CL_ParticleEffect(EFFECT_SVC_PARTICLE, 20*count, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 0);
                        else
-                       {
-                               color = particlepalette[ramp2[r]];
-                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 32 * (8 - r), 478, 0, 0, org[0], org[1], org[2], 0, 0, 0, 1, 16, 256);
-                       }
+                               CL_Sparks(originmins, originmaxs, velocitymins, velocitymaxs, 15*count, 4*count);
                }
+               // bullet hole
+               if (cl_stainmaps.integer) R_Stain(center, 32, 96, 96, 96, 24, 128, 128, 128, 24);
+               CL_SpawnDecalParticleForPoint(center, 6, 3, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
        }
-       else
+       else if (effectnameindex == EFFECT_TE_GUNSHOTQUAD)
        {
-               i = CL_PointSuperContents(org);
-               if (i & (SUPERCONTENTS_SLIME | SUPERCONTENTS_WATER))
+               if (cl_particles_bulletimpacts.integer)
                {
-                       if (cl_particles.integer && cl_particles_bubbles.integer && cl_particles_explosions_bubbles.integer)
-                               for (i = 0;i < 128 * cl_particles_quality.value;i++)
-                                       particle(particletype + pt_bubble, 0x404040, 0x808080, tex_bubble, 2, lhrandom(128, 255), 128, -0.125, 1.5, org[0], org[1], org[2], 0, 0, 0, (1.0 / 16.0), 16, 96);
+                       if (cl_particles_quake.integer)
+                               CL_ParticleEffect(EFFECT_SVC_PARTICLE, 20*count, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 0);
+                       else
+                               CL_Sparks(originmins, originmaxs, velocitymins, velocitymaxs, 15*count, 4*count);
                }
-               else
+               // bullet hole
+               if (cl_stainmaps.integer) R_Stain(center, 32, 96, 96, 96, 24, 128, 128, 128, 24);
+               CL_SpawnDecalParticleForPoint(center, 6, 3, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
+               CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       }
+       else if (effectnameindex == EFFECT_TE_EXPLOSION)
+       {
+               CL_ParticleExplosion(center);
+               CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       }
+       else if (effectnameindex == EFFECT_TE_EXPLOSIONQUAD)
+       {
+               CL_ParticleExplosion(center);
+               CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       }
+       else if (effectnameindex == EFFECT_TE_TAREXPLOSION)
+       {
+               if (cl_particles_quake.integer)
                {
-                       // LordHavoc: smoke effect similar to UT2003, chews fillrate too badly up close
-                       // smoke puff
-                       if (cl_particles.integer && cl_particles_smoke.integer && cl_particles_explosions_smoke.integer)
+                       int i;
+                       for (i = 0;i < 1024 * cl_particles_quality.value;i++)
                        {
-                               for (i = 0;i < 32;i++)
-                               {
-                                       int k;
-                                       vec3_t v, v2;
-                                       for (k = 0;k < 16;k++)
-                                       {
-                                               v[0] = org[0] + lhrandom(-48, 48);
-                                               v[1] = org[1] + lhrandom(-48, 48);
-                                               v[2] = org[2] + lhrandom(-48, 48);
-                                               trace = CL_TraceBox(org, vec3_origin, vec3_origin, v, true, NULL, SUPERCONTENTS_SOLID, false);
-                                               if (trace.fraction >= 0.1)
-                                                       break;
-                                       }
-                                       VectorSubtract(trace.endpos, org, v2);
-                                       VectorScale(v2, 2.0f, v2);
-                                       particle(particletype + pt_smoke, 0x202020, 0x404040, tex_smoke[rand()&7], 12, 32, 64, 0, 0, org[0], org[1], org[2], v2[0], v2[1], v2[2], 0, 0, 0);
-                               }
+                               if (i & 1)
+                                       particle(particletype + pt_static, particlepalette[66], particlepalette[71], tex_particle, 1, lhrandom(182, 255), 182, 0, 0, center[0], center[1], center[2], 0, 0, 0, -4, 16, 256);
+                               else
+                                       particle(particletype + pt_static, particlepalette[150], particlepalette[155], tex_particle, 1, lhrandom(182, 255), 182, 0, 0, center[0], center[1], center[2], 0, 0, lhrandom(-256, 256), 0, 16, 0);
                        }
-
-                       if (cl_particles.integer && cl_particles_sparks.integer && cl_particles_explosions_sparks.integer)
-                               for (i = 0;i < 128 * cl_particles_quality.value;i++)
-                                       particle(particletype + pt_spark, 0x903010, 0xFFD030, tex_particle, 1.0f, lhrandom(0, 255), 512, 1, 0, org[0], org[1], org[2], 0, 0, 80, 0.2, 0, 256);
                }
+               else
+                       CL_ParticleExplosion(center);
+               CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
        }
-
-       if (cl_particles_explosions_shell.integer)
-               R_NewExplosion(org);
+       else if (effectnameindex == EFFECT_TE_SMALLFLASH)
+               CL_AllocDlight(NULL, &tempmatrix, 200, 2, 2, 2, 1000, 0.2, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       else if (effectnameindex == EFFECT_TE_FLAMEJET)
+       {
+               count *= cl_particles_quality.value;
+               while (count-- > 0)
+                       particle(particletype + pt_smoke, 0x6f0f00, 0xe3974f, tex_particle, 4, lhrandom(64, 128), 384, -1, 1.1, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 1, 0, 128);
+       }
+       else if (effectnameindex == EFFECT_TE_LAVASPLASH)
+       {
+               float i, j, inc, vel;
+               vec3_t dir, org;
+
+               inc = 8 / cl_particles_quality.value;
+               for (i = -128;i < 128;i += inc)
+               {
+                       for (j = -128;j < 128;j += inc)
+                       {
+                               dir[0] = j + lhrandom(0, inc);
+                               dir[1] = i + lhrandom(0, inc);
+                               dir[2] = 256;
+                               org[0] = center[0] + dir[0];
+                               org[1] = center[1] + dir[1];
+                               org[2] = center[2] + lhrandom(0, 64);
+                               vel = lhrandom(50, 120) / VectorLength(dir); // normalize and scale
+                               particle(particletype + pt_alphastatic, particlepalette[224], particlepalette[231], tex_particle, 1, inc * lhrandom(24, 32), inc * 12, 0.05, 0, org[0], org[1], org[2], dir[0] * vel, dir[1] * vel, dir[2] * vel, 0, 0, 0);
+                       }
+               }
+       }
+       else if (effectnameindex == EFFECT_TE_TELEPORT)
+       {
+               float i, j, k, inc, vel;
+               vec3_t dir;
+
+               inc = 4 / cl_particles_quality.value;
+               for (i = -16;i < 16;i += inc)
+               {
+                       for (j = -16;j < 16;j += inc)
+                       {
+                               for (k = -24;k < 32;k += inc)
+                               {
+                                       VectorSet(dir, i*8, j*8, k*8);
+                                       VectorNormalize(dir);
+                                       vel = lhrandom(50, 113);
+                                       particle(particletype + pt_alphastatic, particlepalette[7], particlepalette[14], tex_particle, 1, inc * lhrandom(37, 63), inc * 187, 0, 0, center[0] + i + lhrandom(0, inc), center[1] + j + lhrandom(0, inc), center[2] + k + lhrandom(0, inc), dir[0] * vel, dir[1] * vel, dir[2] * vel, 0, 0, 0);
+                               }
+                       }
+               }
+               CL_AllocDlight(NULL, &tempmatrix, 200, 1.0f, 1.0f, 1.0f, 600, 99.0f, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       }
+       else if (effectnameindex == EFFECT_TE_TEI_G3)
+               particle(particletype + pt_beam, 0xFFFFFF, 0xFFFFFF, tex_beam, 8, 256, 256, 0, 0, originmins[0], originmins[1], originmins[2], originmaxs[0], originmaxs[1], originmaxs[2], 0, 0, 0);
+       else if (effectnameindex == EFFECT_TE_TEI_SMOKE)
+       {
+               if (cl_particles_smoke.integer)
+               {
+                       count *= 0.25f * cl_particles_quality.value;
+                       while (count-- > 0)
+                               particle(particletype + pt_smoke, 0x202020, 0x404040, tex_smoke[rand()&7], 5, 255, 512, 0, 0, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 0, 1.5f, 6.0f);
+               }
+       }
+       else if (effectnameindex == EFFECT_TE_TEI_BIGEXPLOSION)
+       {
+               CL_ParticleExplosion(center);
+               CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, -1, true, 1, 0.25, 0.5, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       }
+       else if (effectnameindex == EFFECT_TE_TEI_PLASMAHIT)
+       {
+               float f;
+               if (cl_stainmaps.integer)
+                       R_Stain(center, 40, 96, 96, 96, 40, 128, 128, 128, 40);
+               CL_SpawnDecalParticleForPoint(center, 6, 8, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
+               if (cl_particles_smoke.integer)
+                       for (f = 0;f < count;f += 4.0f / cl_particles_quality.value)
+                               particle(particletype + pt_smoke, 0x202020, 0x404040, tex_smoke[rand()&7], 5, 255, 512, 0, 0, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 0, 20, 155);
+               if (cl_particles_sparks.integer)
+                       for (f = 0;f < count;f += 1.0f / cl_particles_quality.value)
+                               particle(particletype + pt_spark, 0x2030FF, 0x80C0FF, tex_particle, 2.0f, lhrandom(64, 255), 512, 0, 0, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 0, 0, 465);
+               CL_AllocDlight(NULL, &tempmatrix, 500, 0.6f, 1.2f, 2.0f, 2000, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       }
+       else if (effectnameindex == EFFECT_EF_FLAME)
+       {
+               count *= 300 * cl_particles_quality.value;
+               while (count-- > 0)
+                       particle(particletype + pt_smoke, 0x6f0f00, 0xe3974f, tex_particle, 4, lhrandom(64, 128), 384, -1, 0, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 1, 16, 128);
+               CL_AllocDlight(NULL, &tempmatrix, 200, 2.0f, 1.5f, 0.5f, 0, 0, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       }
+       else if (effectnameindex == EFFECT_EF_STARDUST)
+       {
+               count *= 200 * cl_particles_quality.value;
+               while (count-- > 0)
+                       particle(particletype + pt_static, 0x903010, 0xFFD030, tex_particle, 4, lhrandom(64, 128), 128, 1, 0, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 0.2, 16, 128);
+               CL_AllocDlight(NULL, &tempmatrix, 200, 1.0f, 0.7f, 0.3f, 0, 0, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       }
+       else if (!strncmp(particleeffectname[effectnameindex], "TR_", 3))
+       {
+               vec3_t dir, pos;
+               float len, dec, qd;
+               int smoke, blood, bubbles, r, color;
+
+               if (effectnameindex == EFFECT_TR_ROCKET)
+                       CL_AllocDlight(&ent->render, &ent->render.matrix, 200, 3.0f, 1.5f, 0.5f, 0, 0, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+               else if (effectnameindex == EFFECT_TR_VORESPIKE)
+               {
+                       if (gamemode == GAME_PRYDON && !cl_particles_quake.integer)
+                               CL_AllocDlight(&ent->render, &ent->render.matrix, 100, 0.3f, 0.6f, 1.2f, 0, 0, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                       else
+                               CL_AllocDlight(&ent->render, &ent->render.matrix, 200, 1.2f, 0.5f, 1.0f, 0, 0, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+               }
+               else if (effectnameindex == EFFECT_TR_NEXUIZPLASMA)
+                       CL_AllocDlight(&ent->render, &ent->render.matrix, 200, 0.75f, 1.5f, 3.0f, 0, 0, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+
+               if (originmaxs[0] == originmins[0] && originmaxs[1] == originmins[1] && originmaxs[2] == originmins[2])
+                       return;
+
+               VectorSubtract(originmaxs, originmins, dir);
+               len = VectorNormalizeLength(dir);
+               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;
+
+               // advance into this frame to reach the first puff location
+               VectorMA(originmins, dec, dir, pos);
+               len -= dec;
+
+               smoke = cl_particles.integer && cl_particles_smoke.integer;
+               blood = cl_particles.integer && cl_particles_blood.integer;
+               bubbles = cl_particles.integer && cl_particles_bubbles.integer && !cl_particles_quake.integer && (CL_PointSuperContents(pos) & (SUPERCONTENTS_WATER | SUPERCONTENTS_SLIME));
+               qd = 1.0f / cl_particles_quality.value;
+
+               while (len >= 0)
+               {
+                       dec = 3;
+                       if (blood)
+                       {
+                               if (effectnameindex == EFFECT_TR_BLOOD)
+                               {
+                                       if (cl_particles_quake.integer)
+                                       {
+                                               color = particlepalette[67 + (rand()&3)];
+                                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 128, 0, -0.05, pos[0], pos[1], pos[2], 0, 0, 0, 0, 3, 0);
+                                       }
+                                       else
+                                       {
+                                               dec = 16;
+                                               particle(particletype + pt_blood, 0xFFFFFF, 0xFFFFFF, tex_bloodparticle[rand()&7], 8, qd * cl_particles_blood_alpha.value * 768.0f, qd * cl_particles_blood_alpha.value * 384.0f, 0, -1, pos[0], pos[1], pos[2], lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 1, 0, 64);
+                                       }
+                               }
+                               else if (effectnameindex == EFFECT_TR_SLIGHTBLOOD)
+                               {
+                                       if (cl_particles_quake.integer)
+                                       {
+                                               dec = 6;
+                                               color = particlepalette[67 + (rand()&3)];
+                                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 128, 0, -0.05, pos[0], pos[1], pos[2], 0, 0, 0, 0, 3, 0);
+                                       }
+                                       else
+                                       {
+                                               dec = 32;
+                                               particle(particletype + pt_blood, 0xFFFFFF, 0xFFFFFF, tex_bloodparticle[rand()&7], 8, qd * cl_particles_blood_alpha.value * 768.0f, qd * cl_particles_blood_alpha.value * 384.0f, 0, -1, pos[0], pos[1], pos[2], lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 1, 0, 64);
+                                       }
+                               }
+                       }
+                       if (smoke)
+                       {
+                               if (effectnameindex == EFFECT_TR_ROCKET)
+                               {
+                                       if (cl_particles_quake.integer)
+                                       {
+                                               r = rand()&3;
+                                               color = particlepalette[ramp3[r]];
+                                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 42*(6-r), 306, 0, -0.05, pos[0], pos[1], pos[2], 0, 0, 0, 0, 3, 0);
+                                       }
+                                       else
+                                       {
+                                               particle(particletype + pt_smoke, 0x303030, 0x606060, tex_smoke[rand()&7], 3, cl_particles_smoke_alpha.value*62, cl_particles_smoke_alphafade.value*62, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
+                                               particle(particletype + pt_static, 0x801010, 0xFFA020, tex_smoke[rand()&7], 3, cl_particles_smoke_alpha.value*288, cl_particles_smoke_alphafade.value*1400, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 20);
+                                       }
+                               }
+                               else if (effectnameindex == EFFECT_TR_GRENADE)
+                               {
+                                       if (cl_particles_quake.integer)
+                                       {
+                                               r = 2 + (rand()%5);
+                                               color = particlepalette[ramp3[r]];
+                                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 42*(6-r), 306, 0, -0.05, pos[0], pos[1], pos[2], 0, 0, 0, 0, 3, 0);
+                                       }
+                                       else
+                                       {
+                                               particle(particletype + pt_smoke, 0x303030, 0x606060, tex_smoke[rand()&7], 3, cl_particles_smoke_alpha.value*50, cl_particles_smoke_alphafade.value*50, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
+                                       }
+                               }
+                               else if (effectnameindex == EFFECT_TR_WIZSPIKE)
+                               {
+                                       if (cl_particles_quake.integer)
+                                       {
+                                               dec = 6;
+                                               color = particlepalette[52 + (rand()&7)];
+                                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 512, 0, 0, pos[0], pos[1], pos[2], 30*dir[1], 30*-dir[0], 0, 0, 0, 0);
+                                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 512, 0, 0, pos[0], pos[1], pos[2], 30*-dir[1], 30*dir[0], 0, 0, 0, 0);
+                                       }
+                                       else if (gamemode == GAME_GOODVSBAD2)
+                                       {
+                                               dec = 6;
+                                               particle(particletype + pt_static, 0x00002E, 0x000030, tex_particle, 6, 128, 384, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
+                                       }
+                                       else
+                                       {
+                                               color = particlepalette[20 + (rand()&7)];
+                                               particle(particletype + pt_static, color, color, tex_particle, 2, 64, 192, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
+                                       }
+                               }
+                               else if (effectnameindex == EFFECT_TR_KNIGHTSPIKE)
+                               {
+                                       if (cl_particles_quake.integer)
+                                       {
+                                               dec = 6;
+                                               color = particlepalette[230 + (rand()&7)];
+                                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 512, 0, 0, pos[0], pos[1], pos[2], 30*dir[1], 30*-dir[0], 0, 0, 0, 0);
+                                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 512, 0, 0, pos[0], pos[1], pos[2], 30*-dir[1], 30*dir[0], 0, 0, 0, 0);
+                                       }
+                                       else
+                                       {
+                                               color = particlepalette[226 + (rand()&7)];
+                                               particle(particletype + pt_static, color, color, tex_particle, 2, 64, 192, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
+                                       }
+                               }
+                               else if (effectnameindex == EFFECT_TR_VORESPIKE)
+                               {
+                                       if (cl_particles_quake.integer)
+                                       {
+                                               color = particlepalette[152 + (rand()&3)];
+                                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 850, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 8, 0);
+                                       }
+                                       else if (gamemode == GAME_GOODVSBAD2)
+                                       {
+                                               dec = 6;
+                                               particle(particletype + pt_alphastatic, particlepalette[0 + (rand()&255)], particlepalette[0 + (rand()&255)], tex_particle, 6, 255, 384, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
+                                       }
+                                       else if (gamemode == GAME_PRYDON)
+                                       {
+                                               dec = 6;
+                                               particle(particletype + pt_static, 0x103040, 0x204050, tex_particle, 6, 64, 192, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
+                                       }
+                                       else
+                                               particle(particletype + pt_static, 0x502030, 0x502030, tex_particle, 3, 64, 192, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
+                               }
+                               else if (effectnameindex == EFFECT_TR_NEHAHRASMOKE)
+                               {
+                                       dec = 7;
+                                       particle(particletype + pt_alphastatic, 0x303030, 0x606060, tex_smoke[rand()&7], 7, 64, 320, 0, 0, pos[0], pos[1], pos[2], 0, 0, lhrandom(4, 12), 0, 0, 4);
+                               }
+                               else if (effectnameindex == EFFECT_TR_NEXUIZPLASMA)
+                               {
+                                       dec = 4;
+                                       particle(particletype + pt_static, 0x283880, 0x283880, tex_particle, 4, 255, 1024, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 16);
+                               }
+                               else if (effectnameindex == EFFECT_TR_GLOWTRAIL)
+                                       particle(particletype + pt_alphastatic, particlepalette[palettecolor], particlepalette[palettecolor], tex_particle, 5, 128, 320, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
+                       }
+                       if (bubbles)
+                       {
+                               if (effectnameindex == EFFECT_TR_ROCKET)
+                                       particle(particletype + pt_bubble, 0x404040, 0x808080, tex_bubble, 2, lhrandom(64, 255), 256, -0.25, 1.5, pos[0], pos[1], pos[2], 0, 0, 0, (1.0 / 16.0), 0, 16);
+                               else if (effectnameindex == EFFECT_TR_GRENADE)
+                                       particle(particletype + pt_bubble, 0x404040, 0x808080, tex_bubble, 2, lhrandom(64, 255), 256, -0.25, 1.5, pos[0], pos[1], pos[2], 0, 0, 0, (1.0 / 16.0), 0, 16);
+                       }
+                       // advance to next time and position
+                       dec *= qd;
+                       len -= dec;
+                       VectorMA (pos, dec, dir, pos);
+               }
+               ent->persistent.trail_time = len;
+       }
+       else if (developer.integer >= 1)
+               Con_Printf("CL_ParticleEffect_Fallback: no fallback found for effect %s\n", particleeffectname[effectnameindex]);
+}
+
+void CL_ParticleEffect(int effectnameindex, float pcount, const vec3_t originmins, const vec3_t originmaxs, const vec3_t velocitymins, const vec3_t velocitymaxs, entity_t *ent, int palettecolor)
+{
+       vec3_t center;
+       qboolean found = false;
+       if (effectnameindex < 1 || effectnameindex >= MAX_PARTICLEEFFECTNAME)
+               return; // invalid effect index
+       if (!particleeffectname[effectnameindex][0])
+               return; // no such effect
+       VectorLerp(originmins, 0.5, originmaxs, center);
+       if (effectnameindex == EFFECT_SVC_PARTICLE)
+       {
+               if (!cl_particles.integer)
+                       return;
+               // bloodhack checks if this effect's color matches regular or lightning blood and if so spawns a blood effect instead
+               if (pcount == 1024)
+                       CL_ParticleExplosion(center);
+               else if (cl_particles_blood_bloodhack.integer && !cl_particles_quake.integer && (palettecolor == 73 || palettecolor == 225))
+                       CL_ParticleEffect(EFFECT_TE_BLOOD, pcount / 6.0f, originmins, originmaxs, velocitymins, velocitymaxs, NULL, 0);
+               else
+               {
+                       float count = pcount * cl_particles_quality.value;
+                       for (;count > 0;count--)
+                       {
+                               int k = particlepalette[palettecolor + (rand()&7)];
+                               if (cl_particles_quake.integer)
+                                       particle(particletype + pt_alphastatic, k, k, tex_particle, 1, lhrandom(51, 255), 512, 0.05, 0, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 0, 8, 0);
+                               else if (gamemode == GAME_GOODVSBAD2)
+                                       particle(particletype + pt_alphastatic, k, k, tex_particle, 5, 255, 300, 0, 0, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 0, 8, 10);
+                               else
+                                       particle(particletype + pt_alphastatic, k, k, tex_particle, 1, 255, 512, 0, 0, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 0, 8, 15);
+                       }
+               }
+       }
+       else if (!cl_particles_quake.integer && particleeffectinfo[0].effectnameindex)
+       {
+               int effectinfoindex;
+               int supercontents;
+               int tex;
+               particleeffectinfo_t *info;
+               vec3_t center;
+               vec3_t centervelocity;
+               vec3_t traildir;
+               vec3_t trailpos;
+               vec3_t rvec;
+               qboolean underwater;
+               // note this runs multiple effects with the same name, each one spawns only one kind of particle, so some effects need more than one
+               VectorLerp(originmins, 0.5, originmaxs, center);
+               VectorLerp(velocitymins, 0.5, velocitymaxs, centervelocity);
+               supercontents = CL_PointSuperContents(center);
+               underwater = (supercontents & (SUPERCONTENTS_WATER | SUPERCONTENTS_SLIME)) != 0;
+               VectorSubtract(originmaxs, originmins, traildir);
+               VectorNormalize(traildir);
+               for (effectinfoindex = 0, info = particleeffectinfo;effectinfoindex < MAX_PARTICLEEFFECTINFO && info->effectnameindex;effectinfoindex++, info++)
+               {
+                       if (info->effectnameindex == effectnameindex)
+                       {
+                               found = true;
+                               if ((info->flags & PARTICLEEFFECT_UNDERWATER) && !underwater)
+                                       continue;
+                               if ((info->flags & PARTICLEEFFECT_NOTUNDERWATER) && underwater)
+                                       continue;
+
+                               // spawn a dlight if requested
+                               if (info->lightradiusstart > 0)
+                               {
+                                       matrix4x4_t tempmatrix;
+                                       if (info->trailspacing > 0)
+                                               Matrix4x4_CreateTranslate(&tempmatrix, originmaxs[0], originmaxs[1], originmaxs[2]);
+                                       else
+                                               Matrix4x4_CreateTranslate(&tempmatrix, center[0], center[1], center[2]);
+                                       CL_AllocDlight(NULL, &tempmatrix, info->lightradiusstart, info->lightcolor[0], info->lightcolor[1], info->lightcolor[2], info->lightradiusfade, info->lighttime, info->lightcubemapnum, -1, info->lightshadow, 1, 0.25, 0, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+                               }
+
+                               // spawn particles
+                               tex = info->tex[0];
+                               if (info->tex[1] > info->tex[0])
+                               {
+                                       tex = (int)lhrandom(info->tex[0], info->tex[1]);
+                                       tex = min(tex, info->tex[1] - 1);
+                               }
+                               if (info->particletype == pt_decal)
+                                       CL_SpawnDecalParticleForPoint(center, info->originjitter[0], lhrandom(info->size[0], info->size[1]), lhrandom(info->alpha[0], info->alpha[1]), tex, info->color[0], info->color[1]);
+                               else if (info->particletype == pt_beam)
+                                       particle(particletype + info->particletype, info->color[0], info->color[1], tex, lhrandom(info->size[0], info->size[1]), lhrandom(info->alpha[0], info->alpha[1]), info->alpha[2], 0, 0, originmins[0], originmins[1], originmins[2], originmaxs[0], originmaxs[1], originmaxs[2], 0, 0, 0);
+                               else
+                               {
+                                       if (!cl_particles.integer)
+                                               continue;
+                                       switch (info->particletype)
+                                       {
+                                       case pt_smoke: if (!cl_particles_smoke.integer) continue;break;
+                                       case pt_spark: if (!cl_particles_sparks.integer) continue;break;
+                                       case pt_bubble: if (!cl_particles_bubbles.integer) continue;break;
+                                       case pt_blood: if (!cl_particles_blood.integer) continue;break;
+                                       default: break;
+                                       }
+                                       info->particleaccumulator += info->countabsolute + pcount * info->countmultiplier * cl_particles_quality.value;
+                                       VectorCopy(originmins, trailpos);
+                                       for (;info->particleaccumulator > 0;info->particleaccumulator--)
+                                       {
+                                               if (info->tex[1] > info->tex[0])
+                                               {
+                                                       tex = (int)lhrandom(info->tex[0], info->tex[1]);
+                                                       tex = min(tex, info->tex[1] - 1);
+                                               }
+                                               if (info->trailspacing <= 0)
+                                               {
+                                                       trailpos[0] = lhrandom(originmins[0], originmaxs[0]);
+                                                       trailpos[1] = lhrandom(originmins[1], originmaxs[1]);
+                                                       trailpos[2] = lhrandom(originmins[2], originmaxs[2]);
+                                               }
+                                               VectorRandom(rvec);
+                                               particle(particletype + info->particletype, info->color[0], info->color[1], tex, lhrandom(info->size[0], info->size[1]), lhrandom(info->alpha[0], info->alpha[1]), info->alpha[2], info->gravity, info->bounce, trailpos[0] + info->originoffset[0] + info->originjitter[0] * rvec[0], trailpos[1] + info->originoffset[1] + info->originjitter[1] * rvec[1], trailpos[2] + info->originoffset[2] + info->originjitter[2] * rvec[2], lhrandom(velocitymins[0], velocitymaxs[0]) * info->velocitymultiplier + info->velocityoffset[0] + info->velocityjitter[0] * rvec[0], lhrandom(velocitymins[1], velocitymaxs[1]) * info->velocitymultiplier + info->velocityoffset[1] + info->velocityjitter[1] * rvec[1], lhrandom(velocitymins[2], velocitymaxs[2]) * info->velocitymultiplier + info->velocityoffset[2] + info->velocityjitter[2] * rvec[2], info->airfriction, 0, 0);
+                                               if (info->trailspacing > 0)
+                                                       VectorMA(trailpos, info->trailspacing, traildir, trailpos);
+                                       }
+                               }
+                       }
+               }
+       }
+       if (!found)
+               CL_ParticleEffect_Fallback(effectnameindex, pcount, originmins, originmaxs, velocitymins, velocitymaxs, ent, palettecolor);
 }
 
 /*
 ===============
-CL_ParticleExplosion2
-
+CL_EntityParticles
 ===============
 */
-void CL_ParticleExplosion2 (vec3_t org, int colorStart, int colorLength)
+void CL_EntityParticles (const entity_t *ent)
 {
-       int i, k;
+       int i;
+       float pitch, yaw, dist = 64, beamlength = 16, org[3], v[3];
+       static vec3_t avelocities[NUMVERTEXNORMALS];
        if (!cl_particles.integer) return;
 
-       for (i = 0;i < 512 * cl_particles_quality.value;i++)
+       Matrix4x4_OriginFromMatrix(&ent->render.matrix, org);
+
+       if (!avelocities[0][0])
+               for (i = 0;i < NUMVERTEXNORMALS * 3;i++)
+                       avelocities[0][i] = lhrandom(0, 2.55);
+
+       for (i = 0;i < NUMVERTEXNORMALS;i++)
        {
-               k = particlepalette[colorStart + (i % colorLength)];
-               if (cl_particles_quake.integer)
-                       particle(particletype + pt_static, k, k, tex_particle, 1, 255, 850, 0, 0, org[0], org[1], org[2], 0, 0, 0, -4, 8, 256);
-               else
-                       particle(particletype + pt_static, k, k, tex_particle, lhrandom(0.5, 1.5), 255, 512, 0, 0, org[0], org[1], org[2], 0, 0, 0, lhrandom(1.5, 3), 8, 192);
+               yaw = cl.time * avelocities[i][0];
+               pitch = cl.time * avelocities[i][1];
+               v[0] = org[0] + m_bytenormals[i][0] * dist + (cos(pitch)*cos(yaw)) * beamlength;
+               v[1] = org[1] + m_bytenormals[i][1] * dist + (cos(pitch)*sin(yaw)) * beamlength;
+               v[2] = org[2] + m_bytenormals[i][2] * dist + (-sin(pitch)) * beamlength;
+               particle(particletype + pt_entityparticle, particlepalette[0x6f], particlepalette[0x6f], tex_particle, 1, 255, 0, 0, 0, v[0], v[1], v[2], 0, 0, 0, 0, 0, 0);
        }
 }
 
-/*
-===============
-CL_BlobExplosion
 
-===============
-*/
-void CL_BlobExplosion (vec3_t org)
+void CL_ReadPointFile_f (void)
 {
-       int i, k;
-       if (!cl_particles.integer) return;
+       vec3_t org, leakorg;
+       int r, c, s;
+       char *pointfile = NULL, *pointfilepos, *t, tchar;
+       char name[MAX_OSPATH];
+
+       if (!cl.worldmodel)
+               return;
 
-       if (!cl_particles_quake.integer)
+       FS_StripExtension (cl.worldmodel->name, name, sizeof (name));
+       strlcat (name, ".pts", sizeof (name));
+       pointfile = (char *)FS_LoadFile(name, tempmempool, true, NULL);
+       if (!pointfile)
        {
-               CL_ParticleExplosion(org);
+               Con_Printf("Could not open %s\n", name);
                return;
        }
 
-       for (i = 0;i < 1024 * cl_particles_quality.value;i++)
+       Con_Printf("Reading %s...\n", name);
+       VectorClear(leakorg);
+       c = 0;
+       s = 0;
+       pointfilepos = pointfile;
+       while (*pointfilepos)
        {
-               if (i & 1)
-               {
-                       k = particlepalette[66 + rand()%6];
-                       particle(particletype + pt_static, k, k, tex_particle, 1, lhrandom(182, 255), 182, 0, 0, org[0], org[1], org[2], 0, 0, 0, -4, 16, 256);
-               }
-               else
+               while (*pointfilepos == '\n' || *pointfilepos == '\r')
+                       pointfilepos++;
+               if (!*pointfilepos)
+                       break;
+               t = pointfilepos;
+               while (*t && *t != '\n' && *t != '\r')
+                       t++;
+               tchar = *t;
+               *t = 0;
+               r = sscanf (pointfilepos,"%f %f %f", &org[0], &org[1], &org[2]);
+               *t = tchar;
+               pointfilepos = t;
+               if (r != 3)
+                       break;
+               if (c == 0)
+                       VectorCopy(org, leakorg);
+               c++;
+
+               if (cl.num_particles < cl.max_particles - 3)
                {
-                       k = particlepalette[150 + rand()%6];
-                       particle(particletype + pt_static, k, k, tex_particle, 1, lhrandom(182, 255), 182, 0, 0, org[0], org[1], org[2], 0, 0, lhrandom(-256, 256), 0, 16, 0);
+                       s++;
+                       particle(particletype + pt_static, particlepalette[(-c)&15], particlepalette[(-c)&15], tex_particle, 2, 255, 0, 0, 0, org[0], org[1], org[2], 0, 0, 0, 0, 0, 0);
                }
        }
+       Mem_Free(pointfile);
+       VectorCopy(leakorg, org);
+       Con_Printf("%i points read (%i particles spawned)\nLeak at %f %f %f\n", c, s, org[0], org[1], org[2]);
+
+       particle(particletype + pt_beam, 0xFF0000, 0xFF0000, tex_beam, 64, 255, 0, 0, 0, org[0] - 4096, org[1], org[2], org[0] + 4096, org[1], org[2], 0, 0, 0);
+       particle(particletype + pt_beam, 0x00FF00, 0x00FF00, tex_beam, 64, 255, 0, 0, 0, org[0], org[1] - 4096, org[2], org[0], org[1] + 4096, org[2], 0, 0, 0);
+       particle(particletype + pt_beam, 0x0000FF, 0x0000FF, tex_beam, 64, 255, 0, 0, 0, org[0], org[1], org[2] - 4096, org[0], org[1], org[2] + 4096, 0, 0, 0);
 }
 
 /*
 ===============
-CL_RunParticleEffect
+CL_ParseParticleEffect
 
+Parse an effect out of the server message
 ===============
 */
-void CL_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count)
+void CL_ParseParticleEffect (void)
 {
-       int k;
+       vec3_t org, dir;
+       int i, count, msgcount, color;
 
-       if (count == 1024)
-       {
-               CL_ParticleExplosion(org);
-               return;
-       }
-       if (!cl_particles.integer) return;
-       if (cl_particles_quake.integer)
-       {
-               count *= cl_particles_quality.value;
-               while (count--)
-               {
-                       k = particlepalette[color + (rand()&7)];
-                       particle(particletype + pt_alphastatic, k, k, tex_particle, 1, lhrandom(51, 255), 512, 0, 0.05, org[0], org[1], org[2], dir[0], dir[1], dir[2], 0, 8, 0);
-               }
-       }
+       MSG_ReadVector(org, cls.protocol);
+       for (i=0 ; i<3 ; i++)
+               dir[i] = MSG_ReadChar ();
+       msgcount = MSG_ReadByte ();
+       color = MSG_ReadByte ();
+
+       if (msgcount == 255)
+               count = 1024;
        else
-       {
-               count *= cl_particles_quality.value;
-               while (count--)
-               {
-                       k = particlepalette[color + (rand()&7)];
-                       if (gamemode == GAME_GOODVSBAD2)
-                               particle(particletype + pt_alphastatic, k, k, tex_particle, 5, 255, 300, 0, 0, org[0], org[1], org[2], 0, 0, 0, 0, 8, 10);
-                       else
-                               particle(particletype + pt_alphastatic, k, k, tex_particle, 1, 255, 512, 0, 0, org[0], org[1], org[2], dir[0], dir[1], dir[2], 0, 8, 15);
-               }
-       }
+               count = msgcount;
+
+       CL_ParticleEffect(EFFECT_SVC_PARTICLE, count, org, org, dir, dir, NULL, color);
 }
 
-// LordHavoc: added this for spawning sparks/dust (which have strong gravity)
 /*
 ===============
-CL_SparkShower
+CL_ParticleExplosion
+
 ===============
 */
-void CL_SparkShower (vec3_t org, vec3_t dir, int count, vec_t gravityscale, vec_t radius)
+void CL_ParticleExplosion (const vec3_t org)
 {
-       int k;
-
-       if (!cl_particles.integer) return;
+       int i;
+       trace_t trace;
+       //vec3_t v;
+       //vec3_t v2;
+       if (cl_stainmaps.integer)
+               R_Stain(org, 96, 80, 80, 80, 64, 176, 176, 176, 64);
+       CL_SpawnDecalParticleForPoint(org, 40, 48, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
 
-       if (cl_particles_sparks.integer)
+       if (cl_particles_quake.integer)
        {
-               // sparks
-               count *= cl_particles_quality.value;
-               while(count--)
+               for (i = 0;i < 1024;i++)
                {
-                       k = particlepalette[0x68 + (rand() & 7)];
-                       particle(particletype + pt_spark, k, k, tex_particle, 0.4f, lhrandom(64, 255), 512, gravityscale, 0, org[0], org[1], org[2], dir[0], dir[1], dir[2] + sv_gravity.value * 0.1, 0, radius, 64);
+                       int r, color;
+                       r = rand()&3;
+                       if (i & 1)
+                       {
+                               color = particlepalette[ramp1[r]];
+                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 32 * (8 - r), 318, 0, 0, org[0], org[1], org[2], 0, 0, 0, -4, 16, 256);
+                       }
+                       else
+                       {
+                               color = particlepalette[ramp2[r]];
+                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 32 * (8 - r), 478, 0, 0, org[0], org[1], org[2], 0, 0, 0, 1, 16, 256);
+                       }
                }
        }
-}
-
-void CL_Smoke (vec3_t org, vec3_t dir, int count, vec_t radius)
-{
-       vec3_t org2;
-       int k;
-       trace_t trace;
-
-       if (!cl_particles.integer) return;
-
-       // smoke puff
-       if (cl_particles_smoke.integer)
+       else
        {
-               k = count * 0.25 * cl_particles_quality.value;
-               while(k--)
+               i = CL_PointSuperContents(org);
+               if (i & (SUPERCONTENTS_SLIME | SUPERCONTENTS_WATER))
                {
-                       org2[0] = org[0] + 0.125f * lhrandom(-count, count);
-                       org2[1] = org[1] + 0.125f * lhrandom(-count, count);
-                       org2[2] = org[2] + 0.125f * lhrandom(-count, count);
-                       trace = CL_TraceBox(org, vec3_origin, vec3_origin, org2, true, NULL, SUPERCONTENTS_SOLID, false);
-                       particle(particletype + pt_smoke, 0x101010, 0x202020, tex_smoke[rand()&7], 3, 255, 1024, 0, 0, trace.endpos[0], trace.endpos[1], trace.endpos[2], 0, 0, 0, 0, radius, 8);
+                       if (cl_particles.integer && cl_particles_bubbles.integer)
+                               for (i = 0;i < 128 * cl_particles_quality.value;i++)
+                                       particle(particletype + pt_bubble, 0x404040, 0x808080, tex_bubble, 2, lhrandom(128, 255), 128, -0.125, 1.5, org[0], org[1], org[2], 0, 0, 0, (1.0 / 16.0), 16, 96);
+               }
+               else
+               {
+                       // LordHavoc: smoke effect similar to UT2003, chews fillrate too badly up close
+                       // smoke puff
+                       if (cl_particles.integer && cl_particles_smoke.integer && cl_particles_explosions_smoke.integer)
+                       {
+                               for (i = 0;i < 32;i++)
+                               {
+                                       int k;
+                                       vec3_t v, v2;
+                                       for (k = 0;k < 16;k++)
+                                       {
+                                               v[0] = org[0] + lhrandom(-48, 48);
+                                               v[1] = org[1] + lhrandom(-48, 48);
+                                               v[2] = org[2] + lhrandom(-48, 48);
+                                               trace = CL_TraceBox(org, vec3_origin, vec3_origin, v, true, NULL, SUPERCONTENTS_SOLID, false);
+                                               if (trace.fraction >= 0.1)
+                                                       break;
+                                       }
+                                       VectorSubtract(trace.endpos, org, v2);
+                                       VectorScale(v2, 2.0f, v2);
+                                       particle(particletype + pt_smoke, 0x202020, 0x404040, tex_smoke[rand()&7], 12, 32, 64, 0, 0, org[0], org[1], org[2], v2[0], v2[1], v2[2], 0, 0, 0);
+                               }
+                       }
+
+                       if (cl_particles.integer && cl_particles_sparks.integer && cl_particles_explosions_sparks.integer)
+                               for (i = 0;i < 128 * cl_particles_quality.value;i++)
+                                       particle(particletype + pt_spark, 0x903010, 0xFFD030, tex_particle, 1.0f, lhrandom(0, 255), 512, 1, 0, org[0], org[1], org[2], 0, 0, 80, 0.2, 0, 256);
                }
        }
-}
 
-void CL_BulletMark (vec3_t org)
-{
-       if (cl_stainmaps.integer)
-               R_Stain(org, 32, 96, 96, 96, 24, 128, 128, 128, 24);
-       CL_SpawnDecalParticleForPoint(org, 6, 3, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
+       if (cl_particles_explosions_shell.integer)
+               R_NewExplosion(org);
 }
 
-void CL_PlasmaBurn (vec3_t org)
-{
-       if (cl_stainmaps.integer)
-               R_Stain(org, 48, 96, 96, 96, 32, 128, 128, 128, 32);
-       CL_SpawnDecalParticleForPoint(org, 6, 6, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
-}
+/*
+===============
+CL_ParticleExplosion2
 
-static float bloodcount = 0;
-void CL_BloodPuff (vec3_t org, vec3_t vel, int count)
+===============
+*/
+void CL_ParticleExplosion2 (const vec3_t org, int colorStart, int colorLength)
 {
-       float s;
-       vec3_t org2;
-       trace_t trace;
-       // bloodcount is used to accumulate counts too small to cause a blood particle
+       int i, k;
        if (!cl_particles.integer) return;
-       if (cl_particles_quake.integer)
-       {
-               CL_RunParticleEffect(org, vel, 73, count * 2);
-               return;
-       }
-       if (!cl_particles_blood.integer) return;
-
-       s = count + 64.0f;
-       count *= 5.0f;
-       if (count > 1000)
-               count = 1000;
-       bloodcount += count * cl_particles_quality.value;
-       while(bloodcount > 0)
+
+       for (i = 0;i < 512 * cl_particles_quality.value;i++)
        {
-               org2[0] = org[0] + 0.125f * lhrandom(-bloodcount, bloodcount);
-               org2[1] = org[1] + 0.125f * lhrandom(-bloodcount, bloodcount);
-               org2[2] = org[2] + 0.125f * lhrandom(-bloodcount, bloodcount);
-               trace = CL_TraceBox(org, vec3_origin, vec3_origin, org2, true, NULL, SUPERCONTENTS_SOLID, false);
-               particle(particletype + pt_blood, 0xFFFFFF, 0xFFFFFF, tex_bloodparticle[rand()&7], 8, cl_particles_blood_alpha.value * 768, cl_particles_blood_alpha.value * 384, 0, -1, trace.endpos[0], trace.endpos[1], trace.endpos[2], vel[0], vel[1], vel[2], 1, 0, s);
-               bloodcount -= 16;
+               k = particlepalette[colorStart + (i % colorLength)];
+               if (cl_particles_quake.integer)
+                       particle(particletype + pt_static, k, k, tex_particle, 1, 255, 850, 0, 0, org[0], org[1], org[2], 0, 0, 0, -4, 8, 256);
+               else
+                       particle(particletype + pt_static, k, k, tex_particle, lhrandom(0.5, 1.5), 255, 512, 0, 0, org[0], org[1], org[2], 0, 0, 0, lhrandom(1.5, 3), 8, 192);
        }
 }
 
-void CL_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count)
+static void CL_Sparks(const vec3_t originmins, const vec3_t originmaxs, const vec3_t velocitymins, const vec3_t velocitymaxs, float sparkcount, float smokecount)
 {
-       vec3_t org, vel, diff, center, velscale;
-       if (!cl_particles.integer) return;
-       if (!cl_particles_bloodshowers.integer) return;
-       if (!cl_particles_blood.integer) return;
-
-       VectorSubtract(maxs, mins, diff);
-       center[0] = (mins[0] + maxs[0]) * 0.5;
-       center[1] = (mins[1] + maxs[1]) * 0.5;
-       center[2] = (mins[2] + maxs[2]) * 0.5;
-       velscale[0] = velspeed * 2.0 / diff[0];
-       velscale[1] = velspeed * 2.0 / diff[1];
-       velscale[2] = velspeed * 2.0 / diff[2];
-
-       bloodcount += count * 5.0f * cl_particles_quality.value;
-       while (bloodcount > 0)
+       if (cl_particles_sparks.integer)
+       {
+               sparkcount *= cl_particles_quality.value;
+               while(sparkcount-- > 0)
+                       particle(particletype + pt_spark, particlepalette[0x68], particlepalette[0x6f], tex_particle, 0.4f, lhrandom(64, 255), 512, 1, 0, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]) + sv_gravity.value * 0.1, 0, 0, 64);
+       }
+       if (cl_particles_smoke.integer)
        {
-               org[0] = lhrandom(mins[0], maxs[0]);
-               org[1] = lhrandom(mins[1], maxs[1]);
-               org[2] = lhrandom(mins[2], maxs[2]);
-               vel[0] = (org[0] - center[0]) * velscale[0];
-               vel[1] = (org[1] - center[1]) * velscale[1];
-               vel[2] = (org[2] - center[2]) * velscale[2];
-               bloodcount -= 16;
-               particle(particletype + pt_blood, 0xFFFFFF, 0xFFFFFF, tex_bloodparticle[rand()&7], 8, cl_particles_blood_alpha.value * 768, cl_particles_blood_alpha.value * 384, 0, -1, org[0], org[1], org[2], vel[0], vel[1], vel[2], 1, 0, 0);
+               smokecount *= cl_particles_quality.value;
+               while(smokecount-- > 0)
+                       particle(particletype + pt_smoke, 0x101010, 0x202020, tex_smoke[rand()&7], 3, 255, 1024, 0, 0, lhrandom(originmins[0], originmaxs[0]), lhrandom(originmins[1], originmaxs[1]), lhrandom(originmins[2], originmaxs[2]), lhrandom(velocitymins[0], velocitymaxs[0]), lhrandom(velocitymins[1], velocitymaxs[1]), lhrandom(velocitymins[2], velocitymaxs[2]), 0, 0, 8);
        }
 }
 
-void CL_ParticleCube (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorbase, int gravity, int randomvel)
+void CL_ParticleCube (const vec3_t mins, const vec3_t maxs, const vec3_t dir, int count, int colorbase, int gravity, int randomvel)
 {
        int k;
-       float t;
        if (!cl_particles.integer) return;
-       if (maxs[0] <= mins[0]) {t = mins[0];mins[0] = maxs[0];maxs[0] = t;}
-       if (maxs[1] <= mins[1]) {t = mins[1];mins[1] = maxs[1];maxs[1] = t;}
-       if (maxs[2] <= mins[2]) {t = mins[2];mins[2] = maxs[2];maxs[2] = t;}
 
        count *= cl_particles_quality.value;
        while (count--)
@@ -684,15 +1334,12 @@ void CL_ParticleCube (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color
        }
 }
 
-void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorbase, int type)
+void CL_ParticleRain (const vec3_t mins, const vec3_t maxs, const vec3_t dir, int count, int colorbase, int type)
 {
        int k;
-       float t, z, minz, maxz;
+       float z, minz, maxz;
        particle_t *p;
        if (!cl_particles.integer) return;
-       if (maxs[0] <= mins[0]) {t = mins[0];mins[0] = maxs[0];maxs[0] = t;}
-       if (maxs[1] <= mins[1]) {t = mins[1];mins[1] = maxs[1];maxs[1] = t;}
-       if (maxs[2] <= mins[2]) {t = mins[2];mins[2] = maxs[2];maxs[2] = t;}
        if (dir[2] < 0) // falling
                z = maxs[2];
        else // rising??
@@ -736,422 +1383,6 @@ void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color
        }
 }
 
-void CL_Stardust (vec3_t mins, vec3_t maxs, int count)
-{
-       int k;
-       float t;
-       vec3_t o, v, center;
-       if (!cl_particles.integer) return;
-
-       if (maxs[0] <= mins[0]) {t = mins[0];mins[0] = maxs[0];maxs[0] = t;}
-       if (maxs[1] <= mins[1]) {t = mins[1];mins[1] = maxs[1];maxs[1] = t;}
-       if (maxs[2] <= mins[2]) {t = mins[2];mins[2] = maxs[2];maxs[2] = t;}
-
-       center[0] = (mins[0] + maxs[0]) * 0.5f;
-       center[1] = (mins[1] + maxs[1]) * 0.5f;
-       center[2] = (mins[2] + maxs[2]) * 0.5f;
-
-       count *= cl_particles_quality.value;
-       while (count--)
-       {
-               k = particlepalette[224 + (rand()&15)];
-               o[0] = lhrandom(mins[0], maxs[0]);
-               o[1] = lhrandom(mins[1], maxs[1]);
-               o[2] = lhrandom(mins[2], maxs[2]);
-               VectorSubtract(o, center, v);
-               VectorNormalize(v);
-               VectorScale(v, 100, v);
-               v[2] += sv_gravity.value * 0.15f;
-               particle(particletype + pt_static, 0x903010, 0xFFD030, tex_particle, 1.5, lhrandom(64, 128), 128, 1, 0, o[0], o[1], o[2], v[0], v[1], v[2], 0.2, 0, 0);
-       }
-}
-
-void CL_FlameCube (vec3_t mins, vec3_t maxs, int count)
-{
-       int k;
-       float t;
-       if (!cl_particles.integer) return;
-       if (maxs[0] <= mins[0]) {t = mins[0];mins[0] = maxs[0];maxs[0] = t;}
-       if (maxs[1] <= mins[1]) {t = mins[1];mins[1] = maxs[1];maxs[1] = t;}
-       if (maxs[2] <= mins[2]) {t = mins[2];mins[2] = maxs[2];maxs[2] = t;}
-
-       count *= cl_particles_quality.value;
-       while (count--)
-       {
-               k = particlepalette[224 + (rand()&15)];
-               particle(particletype + pt_static, k, k, tex_particle, 4, lhrandom(64, 128), 384, -1, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), 0, 0, 32, 1, 0, 32);
-               if (count & 1)
-                       particle(particletype + pt_static, 0x303030, 0x606060, tex_smoke[rand()&7], 6, lhrandom(48, 96), 64, 0, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), 0, 0, 24, 0, 0, 8);
-       }
-}
-
-void CL_Flames (vec3_t org, vec3_t vel, int count)
-{
-       int k;
-       if (!cl_particles.integer) return;
-
-       count *= cl_particles_quality.value;
-       while (count--)
-       {
-               k = particlepalette[224 + (rand()&15)];
-               particle(particletype + pt_static, k, k, tex_particle, 4, lhrandom(64, 128), 384, -1, 1.1, org[0], org[1], org[2], vel[0], vel[1], vel[2], 1, 0, 128);
-       }
-}
-
-
-
-/*
-===============
-CL_LavaSplash
-
-===============
-*/
-void CL_LavaSplash (vec3_t origin)
-{
-       float i, j, inc, vel;
-       int k, l;
-       vec3_t          dir, org;
-       if (!cl_particles.integer) return;
-
-       if (cl_particles_quake.integer)
-       {
-               inc = 8 / cl_particles_quality.value;
-               for (i = -128;i < 128;i += inc)
-               {
-                       for (j = -128;j < 128;j += inc)
-                       {
-                               dir[0] = j + lhrandom(0, inc);
-                               dir[1] = i + lhrandom(0, inc);
-                               dir[2] = 256;
-                               org[0] = origin[0] + dir[0];
-                               org[1] = origin[1] + dir[1];
-                               org[2] = origin[2] + lhrandom(0, 64);
-                               vel = lhrandom(50, 120) / VectorLength(dir); // normalize and scale
-                               k = l = particlepalette[224 + (rand()&7)];
-                               particle(particletype + pt_alphastatic, k, l, tex_particle, 1, inc * lhrandom(24, 32), inc * 12, 0.05, 0, org[0], org[1], org[2], dir[0] * vel, dir[1] * vel, dir[2] * vel, 0, 0, 0);
-                       }
-               }
-       }
-       else
-       {
-               inc = 32 / cl_particles_quality.value;
-               for (i = -128;i < 128;i += inc)
-               {
-                       for (j = -128;j < 128;j += inc)
-                       {
-                               dir[0] = j + lhrandom(0, inc);
-                               dir[1] = i + lhrandom(0, inc);
-                               dir[2] = 256;
-                               org[0] = origin[0] + dir[0];
-                               org[1] = origin[1] + dir[1];
-                               org[2] = origin[2] + lhrandom(0, 64);
-                               vel = lhrandom(50, 120) / VectorLength(dir); // normalize and scale
-                               if (gamemode == GAME_GOODVSBAD2)
-                               {
-                                       k = particlepalette[0 + (rand()&255)];
-                                       l = particlepalette[0 + (rand()&255)];
-                                       particle(particletype + pt_static, k, l, tex_particle, 12, inc * 8, inc * 8, 0.05, 1, org[0], org[1], org[2], dir[0] * vel, dir[1] * vel, dir[2] * vel, 0, 0, 0);
-                               }
-                               else
-                               {
-                                       k = l = particlepalette[224 + (rand()&7)];
-                                       particle(particletype + pt_static, k, l, tex_particle, 12, inc * 8, inc * 8, 0.05, 0, org[0], org[1], org[2], dir[0] * vel, dir[1] * vel, dir[2] * vel, 0, 0, 0);
-                               }
-                       }
-               }
-       }
-}
-
-/*
-===============
-CL_TeleportSplash
-
-===============
-*/
-void CL_TeleportSplash (vec3_t org)
-{
-       float i, j, k, inc;
-       if (!cl_particles.integer) return;
-
-       if (cl_particles_quake.integer)
-       {
-               inc = 4 / cl_particles_quality.value;
-               for (i = -16;i < 16;i += inc)
-               {
-                       for (j = -16;j < 16;j += inc)
-                       {
-                               for (k = -24;k < 32;k += inc)
-                               {
-                                       vec3_t dir;
-                                       float vel;
-                                       VectorSet(dir, i*8, j*8, k*8);
-                                       VectorNormalize(dir);
-                                       vel = lhrandom(50, 113);
-                                       particle(particletype + pt_alphastatic, particlepalette[7], particlepalette[14], tex_particle, 1, inc * lhrandom(37, 63), inc * 187, 0, 0, org[0] + i + lhrandom(0, inc), org[1] + j + lhrandom(0, inc), org[2] + k + lhrandom(0, inc), dir[0] * vel, dir[1] * vel, dir[2] * vel, 0, 0, 0);
-                               }
-                       }
-               }
-       }
-       else
-       {
-               inc = 8 / cl_particles_quality.value;
-               for (i = -16;i < 16;i += inc)
-                       for (j = -16;j < 16;j += inc)
-                               for (k = -24;k < 32;k += inc)
-                                       particle(particletype + pt_static, 0xA0A0A0, 0xFFFFFF, tex_particle, 10, inc * lhrandom(8, 16), inc * 32, 0, 0, org[0] + i + lhrandom(0, inc), org[1] + j + lhrandom(0, inc), org[2] + k + lhrandom(0, inc), 0, 0, lhrandom(-256, 256), 1, 0, 0);
-       }
-}
-
-void CL_RocketTrail (vec3_t start, vec3_t end, int type, int color, entity_t *ent)
-{
-       vec3_t vec, dir, vel, pos;
-       float len, dec, speed, qd;
-       int smoke, blood, bubbles, r;
-
-       if (end[0] == start[0] && end[1] == start[1] && end[2] == start[2])
-               return;
-
-       VectorSubtract(end, start, dir);
-       VectorNormalize(dir);
-
-       VectorSubtract (end, start, vec);
-       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 = ent->state_current.time - ent->state_previous.time;
-       if (speed)
-               speed = 1.0f / speed;
-       VectorSubtract(ent->state_current.origin, ent->state_previous.origin, vel);
-       color = particlepalette[color];
-       VectorScale(vel, speed, vel);
-
-       // advance into this frame to reach the first puff location
-       VectorMA(start, dec, vec, pos);
-       len -= dec;
-
-       smoke = cl_particles.integer && cl_particles_smoke.integer;
-       blood = cl_particles.integer && cl_particles_blood.integer;
-       bubbles = cl_particles.integer && cl_particles_bubbles.integer && (CL_PointSuperContents(pos) & (SUPERCONTENTS_WATER | SUPERCONTENTS_SLIME));
-       qd = 1.0f / cl_particles_quality.value;
-
-       while (len >= 0)
-       {
-               switch (type)
-               {
-                       case 0: // rocket trail
-                               if (cl_particles_quake.integer)
-                               {
-                                       dec = 3;
-                                       r = rand()&3;
-                                       color = particlepalette[ramp3[r]];
-                                       particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 42*(6-r), 306, 0, -0.05, pos[0], pos[1], pos[2], 0, 0, 0, 0, 3, 0);
-                               }
-                               else
-                               {
-                                       dec = 3;
-                                       if (smoke)
-                                       {
-                                               particle(particletype + pt_smoke, 0x303030, 0x606060, tex_smoke[rand()&7], 3, cl_particles_smoke_alpha.value*62, cl_particles_smoke_alphafade.value*62, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
-                                               particle(particletype + pt_static, 0x801010, 0xFFA020, tex_smoke[rand()&7], 3, cl_particles_smoke_alpha.value*288, cl_particles_smoke_alphafade.value*1400, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 20);
-                                       }
-                                       if (bubbles)
-                                               particle(particletype + pt_bubble, 0x404040, 0x808080, tex_bubble, 2, lhrandom(64, 255), 256, -0.25, 1.5, pos[0], pos[1], pos[2], 0, 0, 0, (1.0 / 16.0), 0, 16);
-                               }
-                               break;
-
-                       case 1: // grenade trail
-                               if (cl_particles_quake.integer)
-                               {
-                                       dec = 3;
-                                       r = 2 + (rand()%5);
-                                       color = particlepalette[ramp3[r]];
-                                       particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 42*(6-r), 306, 0, -0.05, pos[0], pos[1], pos[2], 0, 0, 0, 0, 3, 0);
-                               }
-                               else
-                               {
-                                       dec = 3;
-                                       if (smoke)
-                                               particle(particletype + pt_smoke, 0x303030, 0x606060, tex_smoke[rand()&7], 3, cl_particles_smoke_alpha.value*50, cl_particles_smoke_alphafade.value*50, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
-                               }
-                               break;
-
-
-                       case 2: // blood
-                       case 4: // slight blood
-                               if (cl_particles_quake.integer)
-                               {
-                                       if (type == 2)
-                                       {
-                                               dec = 3;
-                                               color = particlepalette[67 + (rand()&3)];
-                                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 128, 0, -0.05, pos[0], pos[1], pos[2], 0, 0, 0, 0, 3, 0);
-                                       }
-                                       else
-                                       {
-                                               dec = 6;
-                                               color = particlepalette[67 + (rand()&3)];
-                                               particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 128, 0, -0.05, pos[0], pos[1], pos[2], 0, 0, 0, 0, 3, 0);
-                                       }
-                               }
-                               else
-                               {
-                                       dec = 16;
-                                       if (blood)
-                                               particle(particletype + pt_blood, 0xFFFFFF, 0xFFFFFF, tex_bloodparticle[rand()&7], 8, qd * cl_particles_blood_alpha.value * 768.0f, qd * cl_particles_blood_alpha.value * 384.0f, 0, -1, pos[0], pos[1], pos[2], vel[0] * 0.5f, vel[1] * 0.5f, vel[2] * 0.5f, 1, 0, 64);
-                               }
-                               break;
-
-                       case 3: // green tracer
-                               if (cl_particles_quake.integer)
-                               {
-                                       dec = 6;
-                                       color = particlepalette[52 + (rand()&7)];
-                                       particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 512, 0, 0, pos[0], pos[1], pos[2], 30*vec[1], 30*-vec[0], 0, 0, 0, 0);
-                                       particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 512, 0, 0, pos[0], pos[1], pos[2], 30*-vec[1], 30*vec[0], 0, 0, 0, 0);
-                               }
-                               else
-                               {
-                                       dec = 16;
-                                       if (smoke)
-                                       {
-                                               if (gamemode == GAME_GOODVSBAD2)
-                                               {
-                                                       dec = 6;
-                                                       particle(particletype + pt_static, 0x00002E, 0x000030, tex_particle, 6, 128, 384, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
-                                               }
-                                               else
-                                               {
-                                                       dec = 3;
-                                                       color = particlepalette[20 + (rand()&7)];
-                                                       particle(particletype + pt_static, color, color, tex_particle, 2, 64, 192, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
-                                               }
-                                       }
-                               }
-                               break;
-
-                       case 5: // flame tracer
-                               if (cl_particles_quake.integer)
-                               {
-                                       dec = 6;
-                                       color = particlepalette[230 + (rand()&7)];
-                                       particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 512, 0, 0, pos[0], pos[1], pos[2], 30*vec[1], 30*-vec[0], 0, 0, 0, 0);
-                                       particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 512, 0, 0, pos[0], pos[1], pos[2], 30*-vec[1], 30*vec[0], 0, 0, 0, 0);
-                               }
-                               else
-                               {
-                                       dec = 3;
-                                       if (smoke)
-                                       {
-                                               color = particlepalette[226 + (rand()&7)];
-                                               particle(particletype + pt_static, color, color, tex_particle, 2, 64, 192, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
-                                       }
-                               }
-                               break;
-
-                       case 6: // voor trail
-                               if (cl_particles_quake.integer)
-                               {
-                                       dec = 3;
-                                       color = particlepalette[152 + (rand()&3)];
-                                       particle(particletype + pt_alphastatic, color, color, tex_particle, 1, 255, 850, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 8, 0);
-                               }
-                               else
-                               {
-                                       dec = 16;
-                                       if (smoke)
-                                       {
-                                               if (gamemode == GAME_GOODVSBAD2)
-                                               {
-                                                       dec = 6;
-                                                       particle(particletype + pt_alphastatic, particlepalette[0 + (rand()&255)], particlepalette[0 + (rand()&255)], tex_particle, 6, 255, 384, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
-                                               }
-                                               else if (gamemode == GAME_PRYDON)
-                                               {
-                                                       dec = 6;
-                                                       particle(particletype + pt_static, 0x103040, 0x204050, tex_particle, 6, 64, 192, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
-                                               }
-                                               else
-                                               {
-                                                       dec = 3;
-                                                       particle(particletype + pt_static, 0x502030, 0x502030, tex_particle, 3, 64, 192, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
-                                               }
-                                       }
-                               }
-                               break;
-                       case 7: // Nehahra smoke tracer
-                               dec = 7;
-                               if (smoke)
-                                       particle(particletype + pt_alphastatic, 0x303030, 0x606060, tex_smoke[rand()&7], 7, 64, 320, 0, 0, pos[0], pos[1], pos[2], 0, 0, lhrandom(4, 12), 0, 0, 4);
-                               break;
-                       case 8: // Nexuiz plasma trail
-                               dec = 4;
-                               if (smoke)
-                                       particle(particletype + pt_static, 0x283880, 0x283880, tex_particle, 4, 255, 1024, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 16);
-                               break;
-                       case 9: // glow trail
-                               dec = 3;
-                               if (smoke)
-                                       particle(particletype + pt_alphastatic, color, color, tex_particle, 5, 128, 320, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0);
-                               break;
-                       default:
-                               Sys_Error("CL_RocketTrail: unknown trail type %i", type);
-               }
-
-               // advance to next time and position
-               dec *= qd;
-               len -= dec;
-               VectorMA (pos, dec, vec, pos);
-       }
-       ent->persistent.trail_time = len;
-}
-
-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(particletype + pt_beam, tempcolor2, tempcolor2, tex_beam, radius, alpha * 255, alpha * 255 / lifetime, 0, 0, start[0], start[1], start[2], end[0], end[1], end[2], 0, 0, 0);
-}
-
-void CL_Tei_Smoke(const vec3_t org, const vec3_t dir, int count)
-{
-       float f;
-       if (!cl_particles.integer) return;
-
-       // smoke puff
-       if (cl_particles_smoke.integer)
-               for (f = 0;f < count;f += 4.0f / cl_particles_quality.value)
-                       particle(particletype + pt_smoke, 0x202020, 0x404040, tex_smoke[rand()&7], 5, 255, 512, 0, 0, org[0], org[1], org[2], dir[0], dir[1], dir[2], 0, count * 0.125f, count * 0.5f);
-}
-
-void CL_Tei_PlasmaHit(const vec3_t org, const vec3_t dir, int count)
-{
-       float f;
-       if (!cl_particles.integer) return;
-
-       if (cl_stainmaps.integer)
-               R_Stain(org, 40, 96, 96, 96, 40, 128, 128, 128, 40);
-       CL_SpawnDecalParticleForPoint(org, 6, 8, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF);
-
-       // smoke puff
-       if (cl_particles_smoke.integer)
-               for (f = 0;f < count;f += 4.0f / cl_particles_quality.value)
-                       particle(particletype + pt_smoke, 0x202020, 0x404040, tex_smoke[rand()&7], 5, 255, 512, 0, 0, org[0], org[1], org[2], dir[0], dir[1], dir[2], 0, count * 0.125f, count);
-
-       // sparks
-       if (cl_particles_sparks.integer)
-               for (f = 0;f < count;f += 1.0f / cl_particles_quality.value)
-                       particle(particletype + pt_spark, 0x2030FF, 0x80C0FF, tex_particle, 2.0f, lhrandom(64, 255), 512, 0, 0, org[0], org[1], org[2], dir[0], dir[1], dir[2], 0, 0, count * 3.0f);
-}
-
 /*
 ===============
 CL_MoveParticles
@@ -1700,6 +1931,7 @@ static void r_part_start(void)
 {
        particletexturepool = R_AllocTexturePool();
        R_InitParticleTexture ();
+       CL_Particles_LoadEffectInfo();
 }
 
 static void r_part_shutdown(void)
index 2e26185..1b96980 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1036,7 +1036,6 @@ extern cvar_t cl_particles;
 extern cvar_t cl_particles_quality;
 extern cvar_t cl_particles_size;
 extern cvar_t cl_particles_quake;
-extern cvar_t cl_particles_bloodshowers;
 extern cvar_t cl_particles_blood;
 extern cvar_t cl_particles_blood_alpha;
 extern cvar_t cl_particles_blood_bloodhack;
@@ -1058,32 +1057,61 @@ void CL_Particles_Clear(void);
 void CL_Particles_Init(void);
 void CL_Particles_Shutdown(void);
 
+typedef enum effectnameindex_s
+{
+       EFFECT_NONE,
+       EFFECT_TE_GUNSHOT,
+       EFFECT_TE_GUNSHOTQUAD,
+       EFFECT_TE_SPIKE,
+       EFFECT_TE_SPIKEQUAD,
+       EFFECT_TE_SUPERSPIKE,
+       EFFECT_TE_SUPERSPIKEQUAD,
+       EFFECT_TE_WIZSPIKE,
+       EFFECT_TE_KNIGHTSPIKE,
+       EFFECT_TE_VORESPIKE,
+       EFFECT_TE_EXPLOSION,
+       EFFECT_TE_EXPLOSIONQUAD,
+       EFFECT_TE_TAREXPLOSION,
+       EFFECT_TE_TELEPORT,
+       EFFECT_TE_LAVASPLASH,
+       EFFECT_TE_SMALLFLASH,
+       EFFECT_TE_FLAMEJET,
+       EFFECT_EF_FLAME,
+       EFFECT_TE_BLOOD,
+       EFFECT_TE_SPARK,
+       EFFECT_TE_PLASMABURN,
+       EFFECT_TE_TEI_G3,
+       EFFECT_TE_TEI_SMOKE,
+       EFFECT_TE_TEI_BIGEXPLOSION,
+       EFFECT_TE_TEI_PLASMAHIT,
+       EFFECT_EF_STARDUST,
+       EFFECT_TR_ROCKET,
+       EFFECT_TR_GRENADE,
+       EFFECT_TR_BLOOD,
+       EFFECT_TR_WIZSPIKE,
+       EFFECT_TR_SLIGHTBLOOD,
+       EFFECT_TR_KNIGHTSPIKE,
+       EFFECT_TR_VORESPIKE,
+       EFFECT_TR_NEHAHRASMOKE,
+       EFFECT_TR_NEXUIZPLASMA,
+       EFFECT_TR_GLOWTRAIL,
+       EFFECT_SVC_PARTICLE,
+       EFFECT_TOTAL
+}
+effectnameindex_t;
+
+int CL_ParticleEffectIndexForName(const char *name);
+const char *CL_ParticleEffectNameForIndex(int i);
+void CL_ParticleEffect(int effectindex, float pcount, const vec3_t originmins, const vec3_t originmaxs, const vec3_t velocitymins, const vec3_t velocitymaxs, entity_t *ent, int palettecolor);
 void CL_ParseParticleEffect (void);
-void CL_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count);
-void CL_RocketTrail (vec3_t start, vec3_t end, int type, int color, entity_t *ent);
-void CL_SparkShower (vec3_t org, vec3_t dir, int count, vec_t gravityscale, vec_t radius);
-void CL_Smoke (vec3_t org, vec3_t dir, int count, vec_t radius);
-void CL_BulletMark (vec3_t org);
-void CL_PlasmaBurn (vec3_t org);
-void CL_BloodPuff (vec3_t org, vec3_t vel, int count);
-void CL_Stardust (vec3_t mins, vec3_t maxs, int count);
-void CL_FlameCube (vec3_t mins, vec3_t maxs, int count);
-void CL_Flames (vec3_t org, vec3_t vel, int count);
-void CL_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count);
-void CL_ParticleCube (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorbase, int gravity, int randomvel);
-void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorbase, int type);
-void CL_EntityParticles (entity_t *ent);
-void CL_BlobExplosion (vec3_t org);
-void CL_ParticleExplosion (vec3_t org);
-void CL_ParticleExplosion2 (vec3_t org, int colorStart, int colorLength);
-void CL_LavaSplash (vec3_t org);
-void CL_TeleportSplash (vec3_t org);
-void CL_BeamParticle (const vec3_t start, const vec3_t end, vec_t radius, float red, float green, float blue, float alpha, float lifetime);
-void CL_Tei_Smoke(const vec3_t pos, const vec3_t dir, int count);
-void CL_Tei_PlasmaHit(const vec3_t pos, const vec3_t dir, int count);
+void CL_ParticleCube (const vec3_t mins, const vec3_t maxs, const vec3_t dir, int count, int colorbase, int gravity, int randomvel);
+void CL_ParticleRain (const vec3_t mins, const vec3_t maxs, const vec3_t dir, int count, int colorbase, int type);
+void CL_EntityParticles (const entity_t *ent);
+void CL_ParticleExplosion (const vec3_t org);
+void CL_ParticleExplosion2 (const vec3_t org, int colorStart, int colorLength);
 void CL_MoveParticles(void);
 void R_MoveExplosions(void);
-void R_NewExplosion(vec3_t org);
+void R_NewExplosion(const vec3_t org);
 
 #include "cl_screen.h"
 
index 4b155e4..7a2613b 100644 (file)
@@ -538,22 +538,7 @@ void VM_CL_particle (void)
        dir = PRVM_G_VECTOR(OFS_PARM1);
        color = PRVM_G_FLOAT(OFS_PARM2);
        count = PRVM_G_FLOAT(OFS_PARM3);
-       if (cl_particles_blood_bloodhack.integer)
-       {
-               if (color == 73)
-               {
-                       // regular blood
-                       CL_BloodPuff(org, dir, count / 2);
-                       return;
-               }
-               if (color == 225)
-               {
-                       // lightning blood
-                       CL_BloodPuff(org, dir, count / 2);
-                       return;
-               }
-       }
-       CL_RunParticleEffect (org, dir, color, count);
+       CL_ParticleEffect(EFFECT_SVC_PARTICLE, count, org, org, dir, dir, NULL, color);
 }
 
 // #49 void(entity ent, float ideal_yaw, float speed_yaw) ChangeYaw
@@ -741,62 +726,6 @@ matrix4x4_t csqc_listenermatrix;
 qboolean csqc_usecsqclistener = false, csqc_frame = false;//[515]: per-frame
 qboolean csqc_onground;
 
-static char *particleeffect_names[] =
-{
-       "TE_SPIKE",
-       "TE_SUPERSPIKE",
-       "TE_GUNSHOT",
-       "TE_EXPLOSION",
-       "TE_TAREXPLOSION",
-       "TE_LIGHTNING1",//trail
-       "TE_LIGHTNING2",//trail
-       "TE_WIZSPIKE",
-       "TE_KNIGHTSPIKE",
-       "TE_LIGHTNING3",//trail
-       "TE_LAVASPLASH",
-       "TE_TELEPORT",
-       "TE_EXPLOSION2",
-       "TE_BEAM",//trail
-       "TE_EXPLOSION3",
-       "",//TE_LIGHTNING4NEH
-       "TE_BLOOD",
-       "TE_SPARK",
-       "",//TE_BLOODSHOWER
-       "TE_EXPLOSIONRGB",
-       "",//unused
-       "",
-       "",
-       "TE_GUNSHOTQUAD",
-       "TE_SPIKEQUAD",
-       "TE_SUPERSPIKEQUAD",
-       "TE_EXPLOSIONQUAD",
-       "",
-       "",
-       "",
-       "TE_FLAMEJET",
-       "TE_PLASMABURN",
-       "TE_TEI_G3",
-       "TE_TEI_SMOKE",
-       "TE_TEI_BIGEXPLOSION",
-       "TE_TEI_PLASMAHIT",
-
-
-       //trail effects (as modelflags)
-       "EF_ROCKET",
-       "EF_GRENADE",
-       "EF_GIB",
-       "EF_TRACER",
-       "EF_ZOMGIB",
-       "EF_TRACER2",
-       "EF_TRACER3",
-       "EF_NEH_CIGAR",
-       "EF_NEXUIZ_PLASMA",
-       "EF_GLOWTRAIL",
-};
-
-#define CSQC_TRAILSTART 36
-static const int particleeffects_num = sizeof(particleeffect_names)/sizeof(char*);
-
 static void CSQC_R_RecalcView (void)
 {
        extern matrix4x4_t viewmodelmatrix;
@@ -1095,13 +1024,10 @@ void VM_CL_particleeffectnum (void)
        int                     i;
        VM_SAFEPARMCOUNT(1, VM_CL_particleeffectnum);
        n = PRVM_G_STRING(OFS_PARM0);
-       for(i=0;i<particleeffects_num;i++)
-               if(!strcasecmp(particleeffect_names[i], n))
-               {
-                       PRVM_G_FLOAT(OFS_RETURN) = i;
-                       return;
-               }
-       PRVM_G_FLOAT(OFS_RETURN) = -1;
+       i = CL_ParticleEffectIndexForName(n);
+       if (i == 0)
+               i = -1;
+       PRVM_G_FLOAT(OFS_RETURN) = i;
 }
 
 void CSQC_ParseBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightning)
@@ -1146,18 +1072,17 @@ void CSQC_ParseBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightnin
 // #336 void(entity ent, float effectnum, vector start, vector end[, float color]) trailparticles (EXT_CSQC)
 void VM_CL_trailparticles (void)
 {
-       int                             i, entnum, col;
+       int                             i, entnum;
        float                   *start, *end;
-       entity_t                *ent;
+       prvm_edict_t    *t;
        VM_SAFEPARMCOUNT(4, VM_CL_trailparticles);
 
-       entnum  = PRVM_NUM_FOR_EDICT(PRVM_G_EDICT(OFS_PARM0));
+       t = PRVM_G_EDICT(OFS_PARM0);
+       entnum  = PRVM_NUM_FOR_EDICT(t);
        i               = PRVM_G_FLOAT(OFS_PARM1);
        start   = PRVM_G_VECTOR(OFS_PARM2);
        end             = PRVM_G_VECTOR(OFS_PARM3);
 
-       if(i >= particleeffects_num)
-               return;
        if (entnum >= MAX_EDICTS)
        {
                Con_Printf("CSQC_ParseBeam: invalid entity number %i\n", entnum);
@@ -1166,122 +1091,20 @@ void VM_CL_trailparticles (void)
        if (entnum >= cl.max_csqcentities)
                CL_ExpandCSQCEntities(entnum);
 
-       ent = &cl.csqcentities[entnum];
-
-       if(prog->argc > 4)
-               col = PRVM_G_FLOAT(OFS_PARM4);
-       else
-               col = ent->state_current.glowcolor;
-
-       switch(i)
-       {
-       case TE_LIGHTNING1:
-               CSQC_ParseBeam(entnum, start, end, cl.model_bolt, true);
-               break;
-       case TE_LIGHTNING2:
-               CSQC_ParseBeam(entnum, start, end, cl.model_bolt2, true);
-               break;
-       case TE_LIGHTNING3:
-               CSQC_ParseBeam(entnum, start, end, cl.model_bolt3, false);
-               break;
-       case TE_BEAM:
-               CSQC_ParseBeam(entnum, start, end, cl.model_beam, false);
-               break;
-       default:
-               CL_RocketTrail(start, end, i-CSQC_TRAILSTART, col, ent);
-               break;
-       }
+       CL_ParticleEffect(i, VectorDistance(start, end), start, end, t->fields.client->velocity, t->fields.client->velocity, &cl.csqcentities[entnum], PRVM_G_FLOAT(OFS_PARM4));
 }
 
-//#337 void(float effectnum, vector origin [, vector dir, float count]) pointparticles (EXT_CSQC)
+//#337 void(float effectnum, vector origin, vector dir, float count) pointparticles (EXT_CSQC)
 void VM_CL_pointparticles (void)
 {
        int                     i, n;
        float           *f, *v;
-       if(prog->argc < 2)
-               VM_SAFEPARMCOUNT(2, VM_CL_pointparticles);
+       VM_SAFEPARMCOUNT(4, VM_CL_pointparticles);
        i = PRVM_G_FLOAT(OFS_PARM0);
        f = PRVM_G_VECTOR(OFS_PARM1);
-       if(prog->argc >= 4)
-       {
-               v = PRVM_G_VECTOR(OFS_PARM2);
-               n = PRVM_G_FLOAT(OFS_PARM3);
-       }
-       else
-       {
-               v = vec3_origin;
-               n = 15;
-       }
-
-       if(i >= particleeffects_num)
-               return;
-
-       switch(i)
-       {
-       case TE_SPIKE:
-       case TE_SPIKEQUAD:
-       case TE_GUNSHOT:
-       case TE_GUNSHOTQUAD:
-               CL_SparkShower(f, v, 15, 1, 0);
-               CL_Smoke(f, v, 15, 0);
-               if (cl_particles_bulletimpacts.integer)
-                       CL_BulletMark(f);
-               break;
-       case TE_SUPERSPIKE:
-       case TE_SUPERSPIKEQUAD:
-               CL_SparkShower(f, v, 30, 1, 0);
-               CL_Smoke(f, v, 30, 0);
-               if (cl_particles_bulletimpacts.integer)
-                       CL_BulletMark(f);
-               break;
-       case TE_EXPLOSION:
-       case TE_EXPLOSIONQUAD:
-       case TE_TEI_BIGEXPLOSION:
-               CL_ParticleExplosion(f);
-               break;
-       case TE_TAREXPLOSION:
-               CL_BlobExplosion(f);
-               break;
-       case TE_WIZSPIKE:
-               CL_RunParticleEffect(f, v, 20, 30);
-               break;
-       case TE_KNIGHTSPIKE:
-               CL_RunParticleEffect(f, v, 226, 20);
-               break;
-       case TE_LAVASPLASH:
-               CL_LavaSplash(f);
-               break;
-       case TE_TELEPORT:
-               CL_TeleportSplash(f);
-               break;
-       case TE_EXPLOSION2:
-       case TE_EXPLOSION3:
-       case TE_EXPLOSIONRGB:
-               CL_ParticleExplosion2(f, v[0], v[1]);
-               break;
-       case TE_BLOOD:
-               CL_BloodPuff(f, v, n);
-               break;
-       case TE_SPARK:
-               CL_SparkShower(f, v, n, 1, 0);
-               break;
-       case TE_FLAMEJET:
-               CL_Flames(f, v, n);
-               break;
-       case TE_PLASMABURN:
-               CL_PlasmaBurn(f);
-               break;
-       case TE_TEI_G3:
-               CL_BeamParticle(f, v, 8, 1, 1, 1, 1, 1);
-               break;
-       case TE_TEI_SMOKE:
-               CL_Tei_Smoke(f, v, n);
-               break;
-       case TE_TEI_PLASMAHIT:
-               CL_Tei_PlasmaHit(f, v, n);
-               break;
-       default:break;
-       }
+       v = PRVM_G_VECTOR(OFS_PARM2);
+       n = PRVM_G_FLOAT(OFS_PARM3);
+       CL_ParticleEffect(i, n, f, f, v, v, NULL, 0);
 }
 
 //#338 void(string s) cprint (EXT_CSQC)
@@ -1525,16 +1348,25 @@ void VM_CL_te_blood (void)
                return;
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
-       CL_BloodPuff(pos2, PRVM_G_VECTOR(OFS_PARM1), PRVM_G_FLOAT(OFS_PARM2));
+       CL_ParticleEffect(EFFECT_TE_BLOOD, PRVM_G_FLOAT(OFS_PARM2), pos2, pos2, PRVM_G_VECTOR(OFS_PARM1), PRVM_G_VECTOR(OFS_PARM1), NULL, 0);
 }
 
 // #406 void(vector mincorner, vector maxcorner, float explosionspeed, float howmany) te_bloodshower (DP_TE_BLOODSHOWER)
 void VM_CL_te_bloodshower (void)
 {
+       vec_t speed;
+       vec3_t vel1, vel2;
        VM_SAFEPARMCOUNT(4, VM_CL_te_bloodshower);
        if (PRVM_G_FLOAT(OFS_PARM3) < 1)
                return;
-       CL_BloodShower(PRVM_G_VECTOR(OFS_PARM0), PRVM_G_VECTOR(OFS_PARM1), PRVM_G_FLOAT(OFS_PARM2), PRVM_G_FLOAT(OFS_PARM3));
+       speed = PRVM_G_FLOAT(OFS_PARM2);
+       vel1[0] = -speed;
+       vel1[1] = -speed;
+       vel1[2] = -speed;
+       vel2[0] = speed;
+       vel2[1] = speed;
+       vel2[2] = speed;
+       CL_ParticleEffect(EFFECT_TE_BLOOD, PRVM_G_FLOAT(OFS_PARM3), PRVM_G_VECTOR(OFS_PARM0), PRVM_G_VECTOR(OFS_PARM1), vel1, vel2, NULL, 0);
 }
 
 // #407 void(vector org, vector color) te_explosionrgb (DP_TE_EXPLOSIONRGB)
@@ -1555,8 +1387,6 @@ void VM_CL_te_explosionrgb (void)
 void VM_CL_te_particlecube (void)
 {
        VM_SAFEPARMCOUNT(7, VM_CL_te_particlecube);
-       if (PRVM_G_FLOAT(OFS_PARM3) < 1)
-               return;
        CL_ParticleCube(PRVM_G_VECTOR(OFS_PARM0), PRVM_G_VECTOR(OFS_PARM1), PRVM_G_VECTOR(OFS_PARM2), PRVM_G_FLOAT(OFS_PARM3), PRVM_G_FLOAT(OFS_PARM4), PRVM_G_FLOAT(OFS_PARM5), PRVM_G_FLOAT(OFS_PARM6));
 }
 
@@ -1564,8 +1394,6 @@ void VM_CL_te_particlecube (void)
 void VM_CL_te_particlerain (void)
 {
        VM_SAFEPARMCOUNT(5, VM_CL_te_particlerain);
-       if (PRVM_G_FLOAT(OFS_PARM3) < 1)
-               return;
        CL_ParticleRain(PRVM_G_VECTOR(OFS_PARM0), PRVM_G_VECTOR(OFS_PARM1), PRVM_G_VECTOR(OFS_PARM2), PRVM_G_FLOAT(OFS_PARM3), PRVM_G_FLOAT(OFS_PARM4), 0);
 }
 
@@ -1573,8 +1401,6 @@ void VM_CL_te_particlerain (void)
 void VM_CL_te_particlesnow (void)
 {
        VM_SAFEPARMCOUNT(5, VM_CL_te_particlesnow);
-       if (PRVM_G_FLOAT(OFS_PARM3) < 1)
-               return;
        CL_ParticleRain(PRVM_G_VECTOR(OFS_PARM0), PRVM_G_VECTOR(OFS_PARM1), PRVM_G_VECTOR(OFS_PARM2), PRVM_G_FLOAT(OFS_PARM3), PRVM_G_FLOAT(OFS_PARM4), 1);
 }
 
@@ -1585,11 +1411,9 @@ void VM_CL_te_spark (void)
        vec3_t          pos2;
        VM_SAFEPARMCOUNT(3, VM_CL_te_spark);
 
-       if (PRVM_G_FLOAT(OFS_PARM2) < 1)
-               return;
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
-       CL_SparkShower(pos2, PRVM_G_VECTOR(OFS_PARM1), PRVM_G_FLOAT(OFS_PARM2), 1, 0);
+       CL_ParticleEffect(EFFECT_TE_SPARK, PRVM_G_FLOAT(OFS_PARM2), pos2, pos2, PRVM_G_VECTOR(OFS_PARM1), PRVM_G_VECTOR(OFS_PARM1), NULL, 0);
 }
 
 // #412 void(vector org) te_gunshotquad (DP_QUADEFFECTS1)
@@ -1597,16 +1421,11 @@ void VM_CL_te_gunshotquad (void)
 {
        float           *pos;
        vec3_t          pos2;
-       matrix4x4_t     tempmatrix;
        VM_SAFEPARMCOUNT(1, VM_CL_te_gunshotquad);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
-       CL_SparkShower(pos2, vec3_origin, 15, 1, 0);
-       CL_Smoke(pos2, vec3_origin, 15, 0);
-       CL_BulletMark(pos2);
-       Matrix4x4_CreateTranslate(&tempmatrix, pos2[0], pos2[1], pos2[2]);
-       CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       CL_ParticleEffect(EFFECT_TE_GUNSHOTQUAD, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
 }
 
 // #413 void(vector org) te_spikequad (DP_QUADEFFECTS1)
@@ -1614,20 +1433,12 @@ void VM_CL_te_spikequad (void)
 {
        float           *pos;
        vec3_t          pos2;
-       matrix4x4_t     tempmatrix;
        int                     rnd;
        VM_SAFEPARMCOUNT(1, VM_CL_te_spikequad);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
-       if (cl_particles_bulletimpacts.integer)
-       {
-               CL_SparkShower(pos2, vec3_origin, 15, 1, 0);
-               CL_Smoke(pos2, vec3_origin, 15, 0);
-               CL_BulletMark(pos2);
-       }
-       Matrix4x4_CreateTranslate(&tempmatrix, pos2[0], pos2[1], pos2[2]);
-       CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       CL_ParticleEffect(EFFECT_TE_SPIKEQUAD, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
        if (rand() % 5)                 S_StartSound(-1, 0, cl.sfx_tink1, pos2, 1, 1);
        else
        {
@@ -1643,20 +1454,12 @@ void VM_CL_te_superspikequad (void)
 {
        float           *pos;
        vec3_t          pos2;
-       matrix4x4_t     tempmatrix;
        int                     rnd;
        VM_SAFEPARMCOUNT(1, VM_CL_te_superspikequad);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
-       if (cl_particles_bulletimpacts.integer)
-       {
-               CL_SparkShower(pos2, vec3_origin, 30, 1, 0);
-               CL_Smoke(pos2, vec3_origin, 30, 0);
-               CL_BulletMark(pos2);
-       }
-       Matrix4x4_CreateTranslate(&tempmatrix, pos2[0], pos2[1], pos2[2]);
-       CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       CL_ParticleEffect(EFFECT_TE_SUPERSPIKEQUAD, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
        if (rand() % 5)                 S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
        else
        {
@@ -1672,14 +1475,11 @@ void VM_CL_te_explosionquad (void)
 {
        float           *pos;
        vec3_t          pos2;
-       matrix4x4_t     tempmatrix;
        VM_SAFEPARMCOUNT(1, VM_CL_te_explosionquad);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 10);
-       CL_ParticleExplosion(pos2);
-       Matrix4x4_CreateTranslate(&tempmatrix, pos2[0], pos2[1], pos2[2]);
-       CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       CL_ParticleEffect(EFFECT_TE_EXPLOSIONQUAD, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
        S_StartSound(-1, 0, cl.sfx_r_exp3, pos2, 1, 1);
 }
 
@@ -1688,13 +1488,11 @@ void VM_CL_te_smallflash (void)
 {
        float           *pos;
        vec3_t          pos2;
-       matrix4x4_t     tempmatrix;
        VM_SAFEPARMCOUNT(1, VM_CL_te_smallflash);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 10);
-       Matrix4x4_CreateTranslate(&tempmatrix, pos2[0], pos2[1], pos2[2]);
-       CL_AllocDlight(NULL, &tempmatrix, 200, 2, 2, 2, 1000, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       CL_ParticleEffect(EFFECT_TE_SMALLFLASH, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
 }
 
 // #417 void(vector org, float radius, float lifetime, vector color) te_customflash (DP_TE_CUSTOMFLASH)
@@ -1720,9 +1518,7 @@ void VM_CL_te_gunshot (void)
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
-       CL_SparkShower(pos2, vec3_origin, 15, 1, 0);
-       CL_Smoke(pos2, vec3_origin, 15, 0);
-       CL_BulletMark(pos2);
+       CL_ParticleEffect(EFFECT_TE_GUNSHOT, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
 }
 
 // #419 void(vector org) te_spike (DP_TE_STANDARDEFFECTBUILTINS)
@@ -1735,12 +1531,7 @@ void VM_CL_te_spike (void)
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
-       if (cl_particles_bulletimpacts.integer)
-       {
-               CL_SparkShower(pos2, vec3_origin, 15, 1, 0);
-               CL_Smoke(pos2, vec3_origin, 15, 0);
-               CL_BulletMark(pos2);
-       }
+       CL_ParticleEffect(EFFECT_TE_SPIKE, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
        if (rand() % 5)                 S_StartSound(-1, 0, cl.sfx_tink1, pos2, 1, 1);
        else
        {
@@ -1761,12 +1552,7 @@ void VM_CL_te_superspike (void)
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
-       if (cl_particles_bulletimpacts.integer)
-       {
-               CL_SparkShower(pos2, vec3_origin, 30, 1, 0);
-               CL_Smoke(pos2, vec3_origin, 30, 0);
-               CL_BulletMark(pos2);
-       }
+       CL_ParticleEffect(EFFECT_TE_SUPERSPIKE, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
        if (rand() % 5)                 S_StartSound(-1, 0, cl.sfx_tink1, pos2, 1, 1);
        else
        {
@@ -1782,14 +1568,11 @@ void VM_CL_te_explosion (void)
 {
        float           *pos;
        vec3_t          pos2;
-       matrix4x4_t     tempmatrix;
        VM_SAFEPARMCOUNT(1, VM_CL_te_explosion);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 10);
-       CL_ParticleExplosion(pos2);
-       Matrix4x4_CreateTranslate(&tempmatrix, pos2[0], pos2[1], pos2[2]);
-       CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       CL_ParticleEffect(EFFECT_TE_EXPLOSION, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
        S_StartSound(-1, 0, cl.sfx_r_exp3, pos2, 1, 1);
 }
 
@@ -1798,14 +1581,11 @@ void VM_CL_te_tarexplosion (void)
 {
        float           *pos;
        vec3_t          pos2;
-       matrix4x4_t     tempmatrix;
        VM_SAFEPARMCOUNT(1, VM_CL_te_tarexplosion);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 10);
-       CL_BlobExplosion(pos2);
-       Matrix4x4_CreateTranslate(&tempmatrix, pos2[0], pos2[1], pos2[2]);
-       CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+       CL_ParticleEffect(EFFECT_TE_TAREXPLOSION, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
        S_StartSound(-1, 0, cl.sfx_r_exp3, pos2, 1, 1);
 }
 
@@ -1814,14 +1594,11 @@ void VM_CL_te_wizspike (void)
 {
        float           *pos;
        vec3_t          pos2;
-       matrix4x4_t     tempmatrix;
        VM_SAFEPARMCOUNT(1, VM_CL_te_wizspike);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
-       Matrix4x4_CreateTranslate(&tempmatrix, pos2[0], pos2[1], pos2[2]);
-       CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-       CL_RunParticleEffect(pos2, vec3_origin, 20, 30);
+       CL_ParticleEffect(EFFECT_TE_WIZSPIKE, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
        S_StartSound(-1, 0, cl.sfx_wizhit, pos2, 1, 1);
 }
 
@@ -1830,14 +1607,11 @@ void VM_CL_te_knightspike (void)
 {
        float           *pos;
        vec3_t          pos2;
-       matrix4x4_t     tempmatrix;
        VM_SAFEPARMCOUNT(1, VM_CL_te_knightspike);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
-       Matrix4x4_CreateTranslate(&tempmatrix, pos2[0], pos2[1], pos2[2]);
-       CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-       CL_RunParticleEffect(pos2, vec3_origin, 226, 20);
+       CL_ParticleEffect(EFFECT_TE_KNIGHTSPIKE, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
        S_StartSound(-1, 0, cl.sfx_knighthit, pos2, 1, 1);
 }
 
@@ -1845,20 +1619,14 @@ void VM_CL_te_knightspike (void)
 void VM_CL_te_lavasplash (void)
 {
        VM_SAFEPARMCOUNT(1, VM_CL_te_lavasplash);
-       CL_LavaSplash(PRVM_G_VECTOR(OFS_PARM0));
+       CL_ParticleEffect(EFFECT_TE_LAVASPLASH, 1, PRVM_G_VECTOR(OFS_PARM0), PRVM_G_VECTOR(OFS_PARM0), vec3_origin, vec3_origin, NULL, 0);
 }
 
 // #426 void(vector org) te_teleport (DP_TE_STANDARDEFFECTBUILTINS)
 void VM_CL_te_teleport (void)
 {
-       float           *pos;
-       matrix4x4_t     tempmatrix;
        VM_SAFEPARMCOUNT(1, VM_CL_te_teleport);
-
-       pos = PRVM_G_VECTOR(OFS_PARM0);
-       Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
-       CL_AllocDlight(NULL, &tempmatrix, 200, 1.0f, 1.0f, 1.0f, 600, 99.0f, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-       CL_TeleportSplash(pos);
+       CL_ParticleEffect(EFFECT_TE_TELEPORT, 1, PRVM_G_VECTOR(OFS_PARM0), PRVM_G_VECTOR(OFS_PARM0), vec3_origin, vec3_origin, NULL, 0);
 }
 
 // #427 void(vector org, float colorstart, float colorlength) te_explosion2 (DP_TE_STANDARDEFFECTBUILTINS)
@@ -1961,14 +1729,11 @@ void VM_CL_te_plasmaburn (void)
 {
        float           *pos;
        vec3_t          pos2;
-       matrix4x4_t     tempmatrix;
        VM_SAFEPARMCOUNT(1, VM_CL_te_plasmaburn);
 
        pos = PRVM_G_VECTOR(OFS_PARM0);
        CL_FindNonSolidLocation(pos, pos2, 4);
-       Matrix4x4_CreateTranslate(&tempmatrix, pos2[0], pos2[1], pos2[2]);
-       CL_AllocDlight(NULL, &tempmatrix, 200, 1, 1, 1, 1000, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
-       CL_PlasmaBurn(pos2);
+       CL_ParticleEffect(EFFECT_TE_PLASMABURN, 1, pos2, pos2, vec3_origin, vec3_origin, NULL, 0);
 }
 
 
index 28f8bae..2f249f9 100644 (file)
@@ -141,7 +141,7 @@ void R_Explosion_Init(void)
        R_RegisterModule("R_Explosions", r_explosion_start, r_explosion_shutdown, r_explosion_newmap);
 }
 
-void R_NewExplosion(vec3_t org)
+void R_NewExplosion(const vec3_t org)
 {
        int i, j;
        float dist, n;
diff --git a/todo b/todo
index a61ce3f..0ed100e 100644 (file)
--- a/todo
+++ b/todo
@@ -21,7 +21,7 @@
 -d (Vermeulen) bug darkplaces physics: q3bsp collisions are still glitchy, particularly gunshots hitting thin air near brushes, even with mod_q3bsp_optimizedtraceline 0, test in dpdm2r by shooting down through gaps in the architecture around the top platform (Vermeulen)
 -d (Vermeulen) bug darkplaces protocol: sometimes players are invisible in nexuiz, showing only their gun model, this may be related to svc_precache messages not being sent during signon (Vermeulen)
 -d (Wazat) bug darkplaces renderer: make sure that unlit maps show up fullbright (Wazat)
--d (div0, SavageX, Kazashi) bug darkplaces server: sv_jumpstep should be defaulted to off because it makes it possible to reach places one should not be able to reach in quake, it can be turned on by particular games if desired (div0, SavageX, Kazashi)
+-d (div0, SavageX) bug darkplaces server: sv_jumpstep should be defaulted to off because it makes it possible to reach places one should not be able to reach in quake, it can be turned on by particular games if desired (div0, SavageX, Kazashi)
 -d (evilfrog) bug darkplaces server: error() qc builtin does not print error message, just Host_Error: Program error or something similar (evilfrog)
 -d (flum) bug darkplaces client: corona on your own muzzleflash is annoying when looking down because it can be seen, disable corona on all muzzleflashes (flum)
 -d (hyenur) change dpmod: make cells only 30 damage, they're too powerful now (hyenur)
 -d (yummyluv) feature darkplaces protocol: add buttons 9-16 (yummyluv)
 -f (James D) bug darkplaces server: losing runes on episode completion, completing episode 1 then 2 then 3 causes it to forget 1, then 4 causes it to forget 2 and 3, making it impossible to open the boss gate (James D)
 -f (Wazat) bug darkplaces: client's slowmo detection (measuring packet times and comparing to game time changes) may be making the game unpleasant (Wazat)
+0 feature darkplaces website: add download link for deluxemaps_id1.pk3
+0 change darkplaces server: remove upper limit on sv_maxrate, there's no reason to limit it
+0 bug darkplaces prvm: engine calls to qc functions are not counting as function calls in the prvm_profile results, so for example SV_PlayerPhysics is being shown with a 0 call count
+0 bug darkplaces prvm: unknown opcode warnings are missing a \n
+0 feature hmap2: produce .vis files which contain a numvisleafs, an array of visofs values for all the leafs of the bsp, and the new data for the visibility lump, this would avoid the need for vispatch
+0 feature darkplaces loader: load .vis files produced by hmap2
+0 feature dpmod: include .vis files for all id1 maps
+0 feature dpmod: include .lit and .dlit files for all id1 maps
 0 bug darkplaces client: GAME_NEHAHRA: make sure cutscenes and movies work, got a report of seeing a black screen (NightFright)
 0 bug darkplaces client: fix cl_bobmodel bug which momentarily jolts the gun when you pass through a trigger, pick up an item, etc, Sajt thinks this is related to console prints as well as centerprint (Sajt)
 0 bug darkplaces collision: frikbots are falling through the map (Sajt)
@@ -42,6 +50,7 @@
 0 bug darkplaces csqc: engine-based rocket entities have a trail but they don't glow if csqc is used
 0 bug darkplaces loader: make rtlight entity loader support q3map/q3map2 lights properly, they use a spawnflag for LINEAR mode, by default they use 1/(x*x) falloff (Carni, motorsep)
 0 bug darkplaces loader: occasional crash due to memory corruption when doing "deathmatch 1;map start" during demo loop (Willis)
+0 bug darkplaces loader: zym models are not loading some of their meshes?  this is causing the striped part of the nexuiz RL to disappear (div0, SavageX)
 0 bug darkplaces renderer: deluxemaps are not detected in some maps that do have them?  (SavageX)
 0 bug darkplaces renderer: modify r_showtris_polygonoffset to push back all filled geometry, not lines, because polygonoffset will not affect GL_LINES at all
 0 bug darkplaces renderer: monsters teleporting in really slow down rendering, perhaps the teleport light is casting huge shadows?  new information suggests it is the particles. (romi, lcatlnx)
@@ -71,6 +80,7 @@
 0 bug hmap2 -vis: test that bitlongs code works properly on big endian systems such as Mac (LordHavoc)
 0 bug hmap2: figure out why there is a subtle difference between bmodel lighting and wall lighting, something to do with nudges causing different attenuation? (Urre)
 0 bug hmap: strip .map extension from filename if present
+0 change darkplaces client: change timedemo minfps/maxfps to be the lowest and highest fps in one second segments, similar to the showfps display, this should solve the precision problems resulting in stupidly high/low fps reports (m0rfar)
 0 change darkplaces client: disable all possible 'cheat' things unless -developer is given on commandline, this includes r_show*, r_test, gl_lightmaps, r_fullbright
 0 change darkplaces client: particles shouldn't be using contents checks to decide whether to die, they should use movement traces
 0 change darkplaces client: restrict wateralpha and such cvars according to what is permitted in qw serverinfo?
 0 change zmodel: include the example script in the build zips, not just in the files directory
 0 cleanup darkplaces cleanup: remove cgame* files and any references
 0 cleanup darkplaces cleanup: remove ui.* files and any references
+0 feature darkplaces client: add .qwd demo support
+0 feature darkplaces client: add .mvd demo support
+0 feature darkplaces client: add .loc file support and say macros
+0 feature darkplaces client: add ezQuake-style hud layout as an option - http://quake.tek.pl/_sshots/candy/redfog.png
+0 change darkplaces client: get image sizes from .lmp files if present
+0 change darkplaces client: hardcode sbar image sizes so they can be replaced with higher quality images
+0 feature dpmod: add higher quality replacement sbar images
 0 feature darkplaces client: add a cl_showspeed cvar to display a hud overlay of your current velocity, speed as length of velocity, and speed along forward vector (Spike)
 0 feature darkplaces client: add a cvar to make the renderer use a different entity for pvs than for viewing, this might be useful for a third person camera that should only see what the player sees (Urre)
 0 feature darkplaces client: add an alias to control whether the nexuiz logo.dpv splash video plays at startup and whether the menu opens, this way the config can change it before it happens, for instance to disable it, or to set up a similar thing in other games (green)