yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

client: reuse combined colors in CL_BlasterParticles2

Browse source
This commit is contained in:
Denis Pauk 2024-09-08 18:20:04 +03:00
parent db0328a251
commit 1d8de9a89a
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/cl_effects.c
View file

@ -2925,7 +2925,7 @@ CL_ParticleSmokeEffect(vec3_t org, vec3_t dir, int color,
* Wall impact puffs (Green) * Wall impact puffs (Green)
*/ */
void void
CL_BlasterParticles2(vec3_t org, vec3_t dir, unsigned int color) CL_BlasterParticles2(vec3_t org, vec3_t dir, unsigned int basecolor, unsigned int finalcolor)
{ {
int i, j; int i, j;
cparticle_t *p; cparticle_t *p;
@ -2950,8 +2950,8 @@ CL_BlasterParticles2(vec3_t org, vec3_t dir, unsigned int color)
active_particles = p; active_particles = p;
p->time = time; p->time = time;
p->color = VID_PaletteColor(color + (randk() & 7));
d = (float)(randk() & 15); d = (float)(randk() & 15);
p->color = CombineColors(basecolor, finalcolor, d / 15.0);
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
{ {

4
src/client/cl_tempentities.c
View file

@ -1053,11 +1053,11 @@ CL_ParseTEnt(void)
if (type == TE_BLASTER2) if (type == TE_BLASTER2)
{ {
CL_BlasterParticles2(pos, dir, 0xd0); CL_BlasterParticles2(pos, dir, 0xff00ff00, 0xffffffff);
} }
else else
{ {
CL_BlasterParticles2(pos, dir, 0x6f); CL_BlasterParticles2(pos, dir, 0xffb7a787, 0xff5b430f);
} }
ex = CL_AllocExplosion(); ex = CL_AllocExplosion();

2
src/client/header/client.h
View file

@ -395,7 +395,7 @@ void CL_FlagTrail (vec3_t start, vec3_t end, int color);
void CL_IonripperTrail (vec3_t start, vec3_t end); void CL_IonripperTrail (vec3_t start, vec3_t end);
void CL_BlasterParticles2 (vec3_t org, vec3_t dir, unsigned int color); void CL_BlasterParticles2 (vec3_t org, vec3_t dir, unsigned int basecolor, unsigned int finalcolor);
void CL_BlasterTrail2 (vec3_t start, vec3_t end); void CL_BlasterTrail2 (vec3_t start, vec3_t end);
void CL_DebugTrail (vec3_t start, vec3_t end); void CL_DebugTrail (vec3_t start, vec3_t end);
void CL_SmokeTrail (vec3_t start, vec3_t end, int colorStart, int colorRun, int spacing); void CL_SmokeTrail (vec3_t start, vec3_t end, int colorStart, int colorRun, int spacing);