Weapon following: Subtract player velocity from gun origin rather than making the...

[xonotic/darkplaces.git] / cl_particles.c

diff --git a/cl_particles.c b/cl_particles.c
index 6dd333cf34e4796c5027edd116be6022cbb86cdc..04bcbfb8d75f2a1d71a855cba7c667304d478511 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -628,7 +628,7 @@ particle_t *CL_NewParticle(const vec3_t sortorigin, unsigned short ptypeindex, i
        part->staincolor[0] = r;
        part->staincolor[1] = g;
        part->staincolor[2] = b;
-       part->stainalpha = palpha * stainalpha / 256;
+       part->stainalpha = palpha * stainalpha;
        part->stainsize = psize * stainsize;
        part->texnum = ptex;
        part->size = psize;
@@ -1389,7 +1389,7 @@ void CL_ParticleTrail(int effectnameindex, float pcount, const vec3_t originmins
                                                // called when effect starts
                                                CL_AllocLightFlash(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);
                                        }
-                                       else
+                                       else if (r_refdef.scene.numlights < MAX_DLIGHTS)
                                        {
                                                // glowing entity
                                                // called by CL_LinkNetworkEntity