From 9b6483b2f9cb6ec521e9fdb6c00957834ad62bcc Mon Sep 17 00:00:00 2001 From: havoc Date: Wed, 17 Jul 2002 05:15:21 +0000 Subject: [PATCH] scrag, hellknight, and shalrath shots now glow, also tweaked the particle colors and made them additive blend git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2043 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_main.c | 15 +++++++++++++++ cl_particles.c | 14 +++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/cl_main.c b/cl_main.c index 016cf26d..4f83e460 100644 --- a/cl_main.c +++ b/cl_main.c @@ -521,9 +521,19 @@ static void CL_RelinkNetworkEntities() else if (ent->render.model->flags & EF_ZOMGIB) CL_RocketTrail (oldorg, neworg, 4, ent); else if (ent->render.model->flags & EF_TRACER) + { CL_RocketTrail (oldorg, neworg, 3, ent); + dlightcolor[0] += 0x10; + dlightcolor[1] += 0x40; + dlightcolor[2] += 0x10; + } else if (ent->render.model->flags & EF_TRACER2) + { CL_RocketTrail (oldorg, neworg, 5, ent); + dlightcolor[0] += 0x50; + dlightcolor[1] += 0x30; + dlightcolor[2] += 0x10; + } else if (ent->render.model->flags & EF_ROCKET) { CL_RocketTrail (oldorg, ent->render.origin, 0, ent); @@ -539,7 +549,12 @@ static void CL_RelinkNetworkEntities() CL_RocketTrail (oldorg, neworg, 1, ent); } else if (ent->render.model->flags & EF_TRACER3) + { CL_RocketTrail (oldorg, neworg, 6, ent); + dlightcolor[0] += 0x50; + dlightcolor[1] += 0x20; + dlightcolor[2] += 0x40; + } } } // LordHavoc: customizable glow diff --git a/cl_particles.c b/cl_particles.c index a8ed781c..a952263c 100644 --- a/cl_particles.c +++ b/cl_particles.c @@ -797,36 +797,36 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent) if (!cl_particles_blood.integer) return; dec = lhrandom(cl_particles_blood_size_min.value, cl_particles_blood_size_max.value); - particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, 9999, -1, pos[0], pos[1], pos[2], vel[0] * 0.5f + lhrandom(-64, 64), vel[1] * 0.5f + lhrandom(-64, 64), vel[2] * 0.5f + lhrandom(-64, 64), 0, 0, 0, 0, 1, 0); + particle(pt_blood, PARTICLE_BILLBOARD, 0x100000, 0x280000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, 9999, -1, pos[0], pos[1], pos[2], vel[0] * 0.5f + lhrandom(-64, 64), vel[1] * 0.5f + lhrandom(-64, 64), vel[2] * 0.5f + lhrandom(-64, 64), 0, 0, 0, 0, 1, 0); break; case 4: // slight blood if (!cl_particles_blood.integer) return; dec = lhrandom(cl_particles_blood_size_min.value, cl_particles_blood_size_max.value); - particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, 9999, -1, pos[0], pos[1], pos[2], vel[0] * 0.5f + lhrandom(-64, 64), vel[1] * 0.5f + lhrandom(-64, 64), vel[2] * 0.5f + lhrandom(-64, 64), 0, 0, 0, 0, 1, 0); + particle(pt_blood, PARTICLE_BILLBOARD, 0x100000, 0x280000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, 9999, -1, pos[0], pos[1], pos[2], vel[0] * 0.5f + lhrandom(-64, 64), vel[1] * 0.5f + lhrandom(-64, 64), vel[2] * 0.5f + lhrandom(-64, 64), 0, 0, 0, 0, 1, 0); break; case 3: // green tracer dec = 6; - particle(pt_fade, PARTICLE_BILLBOARD, 0x373707, 0x373707, tex_particle, false, false, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0); + particle(pt_fade, PARTICLE_BILLBOARD, 0x002000, 0x003000, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0); break; case 5: // flame tracer dec = 6; - particle(pt_fade, PARTICLE_BILLBOARD, 0xCF632B, 0xCF632B, tex_particle, false, false, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0); + particle(pt_fade, PARTICLE_BILLBOARD, 0x301000, 0x502000, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0); break; case 6: // voor trail dec = 6; - particle(pt_fade, PARTICLE_BILLBOARD, 0x47232B, 0x47232B, tex_particle, false, false, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0); + particle(pt_fade, PARTICLE_BILLBOARD, 0x502030, 0x502030, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0); break; case 7: // Nehahra smoke tracer if (!cl_particles_smoke.integer) return; - dec = 10; - particle(pt_smoke, PARTICLE_BILLBOARD, 0x202020, 0x404040, tex_smoke[rand()&7], true, false, dec, dec, 64, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); + dec = 7; + particle(pt_smoke, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], true, false, dec, dec, 64, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-4, 4), lhrandom(-4, 4), lhrandom(0, 16), 0, 0, 0, 0, 0, 0); break; } -- 2.39.2