]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
Tried to make the vore spike trail to be blue under GAME_PRYDON mode. Failed and...
authortomaz <tomaz@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 24 Aug 2004 18:17:31 +0000 (18:17 +0000)
committertomaz <tomaz@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 24 Aug 2004 18:17:31 +0000 (18:17 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4369 d7cf8633-e32d-0410-b094-e92efae38249

cl_main.c
cl_particles.c

index 2aedf0b226fcdb21b3945064265d1b4f078c53e8..b387273f45b2abc8eab3f33167b74446c97aecd1 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -786,10 +786,20 @@ void CL_LinkNetworkEntity(entity_t *e)
                        else if (e->render.model->flags & EF_TRACER3)
                        {
                                trailtype = 6;
-                               dlightradius = max(dlightradius, 200);
-                               dlightcolor[0] += 1.20f;
-                               dlightcolor[1] += 0.50f;
-                               dlightcolor[2] += 1.00f;
+                               if (gamemode == GAME_PRYDON)
+                               {
+                                       dlightradius = max(dlightradius, 100);
+                                       dlightcolor[0] += 0.50f;
+                                       dlightcolor[1] += 0.50f;
+                                       dlightcolor[2] += 1.20f;
+                               }
+                               else
+                               {
+                                       dlightradius = max(dlightradius, 200);
+                                       dlightcolor[0] += 1.20f;
+                                       dlightcolor[1] += 0.50f;
+                                       dlightcolor[2] += 1.00f;
+                               }
                        }
                }
                // LordHavoc: customizable glow
index ed0fa41c3c08d4c692bcfa3d9d7aee08057cb586..6e936f9213a052414f999590e2af7aaf061fbc5b 100644 (file)
@@ -1195,6 +1195,8 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
                                {
                                        if (gamemode == GAME_GOODVSBAD2)
                                                particle(pt_static, PARTICLE_BILLBOARD, particlepalette[0 + (rand()&255)], particlepalette[0 + (rand()&255)], tex_particle, false, PBLEND_ALPHA, 6, 6, qd*255, qd*384, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 0, 0, 0, 0, 0, 0);
+                                       else if (gamemode == GAME_PRYDON)
+                                               particle(pt_static, PARTICLE_BILLBOARD, 0x202040, 0x202040, tex_particle, false, PBLEND_ADD, 6, 6, qd*128, qd*384, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 0, 0, 0, 0, 0, 0);
                                        else
                                                particle(pt_static, PARTICLE_BILLBOARD, 0x502030, 0x502030, tex_particle, false, PBLEND_ADD, 6, 6, qd*128, qd*384, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 0, 0, 0, 0, 0, 0);
                                }