From d3e8e4ed118834b2dbef36479dc0ab6a547a9856 Mon Sep 17 00:00:00 2001 From: Ragnvald Maartmann-Moe IV Date: Mon, 17 Sep 2001 01:48:52 +0000 Subject: [PATCH] Sparks and a little smoke from TE_LIGHTNINGBLOOD. And kill R_RunGunshotEffect. --- libs/video/renderer/gl/gl_dyn_part.c | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libs/video/renderer/gl/gl_dyn_part.c b/libs/video/renderer/gl/gl_dyn_part.c index 435cf6d21..1e15df814 100644 --- a/libs/video/renderer/gl/gl_dyn_part.c +++ b/libs/video/renderer/gl/gl_dyn_part.c @@ -264,24 +264,10 @@ R_RunSparkEffect (vec3_t org, int count, int ofuzz) 12 + (rand () & 3), 64 + (rand () & 31)); while (count--) particle_new_random (pt_fallfadespark, part_tex_spark, org, - ofuzz * .75, 1, 96, r_realtime + 5, + ofuzz * 0.75, 1, 96, r_realtime + 5, ramp[rand () & 7], 255); } -inline static void -R_RunGunshotEffect (vec3_t org, int count) -{ - int scale; - - if (count > 6) - scale = 24; - else - scale = 16; - - R_RunSparkEffect (org, count / 2, scale); - return; -} - inline static void R_BloodPuff (vec3_t org, int count) { @@ -297,13 +283,27 @@ R_RunPuffEffect (vec3_t org, particle_effect_t type, byte count) switch (type) { case PE_GUNSHOT: - R_RunGunshotEffect (org, count); + { + int scale = 16; + + if (count > 6) + scale = 24; + R_RunSparkEffect (org, count / 2, scale); + } break; case PE_BLOOD: R_BloodPuff (org, count); break; case PE_LIGHTNINGBLOOD: R_BloodPuff (org, 5 + (rand () & 1)); + count = 4 + (rand () % 5); + particle_new (pt_smokecloud, part_tex_smoke[rand () & 7], org, + 3, vec3_origin, r_realtime + 9, + 12 + (rand () & 3), 64 + (rand () & 31)); + while (count--) + particle_new_random (pt_fallfadespark, part_tex_spark, org, + 16, 1, 128, r_realtime + 5, + 244 + (rand () % 3), 255); break; default: break;