mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-05-07 00:11:13 +00:00
Sparks and a little smoke from TE_LIGHTNINGBLOOD.
And kill R_RunGunshotEffect.
This commit is contained in:
parent
a7d8e2c0ea
commit
d3e8e4ed11
1 changed files with 16 additions and 16 deletions
|
@ -264,24 +264,10 @@ R_RunSparkEffect (vec3_t org, int count, int ofuzz)
|
||||||
12 + (rand () & 3), 64 + (rand () & 31));
|
12 + (rand () & 3), 64 + (rand () & 31));
|
||||||
while (count--)
|
while (count--)
|
||||||
particle_new_random (pt_fallfadespark, part_tex_spark, org,
|
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);
|
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
|
inline static void
|
||||||
R_BloodPuff (vec3_t org, int count)
|
R_BloodPuff (vec3_t org, int count)
|
||||||
{
|
{
|
||||||
|
@ -297,13 +283,27 @@ R_RunPuffEffect (vec3_t org, particle_effect_t type, byte count)
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case PE_GUNSHOT:
|
case PE_GUNSHOT:
|
||||||
R_RunGunshotEffect (org, count);
|
{
|
||||||
|
int scale = 16;
|
||||||
|
|
||||||
|
if (count > 6)
|
||||||
|
scale = 24;
|
||||||
|
R_RunSparkEffect (org, count / 2, scale);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case PE_BLOOD:
|
case PE_BLOOD:
|
||||||
R_BloodPuff (org, count);
|
R_BloodPuff (org, count);
|
||||||
break;
|
break;
|
||||||
case PE_LIGHTNINGBLOOD:
|
case PE_LIGHTNINGBLOOD:
|
||||||
R_BloodPuff (org, 5 + (rand () & 1));
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue