From d2bbe9dfd2b2007823970c964de5d44150364ed2 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 5 Jan 2024 04:08:52 +0300 Subject: [PATCH] engine: client: don't spawn multiple model effects --- engine/client/cl_tent.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/engine/client/cl_tent.c b/engine/client/cl_tent.c index 932f62e8..3a6a193b 100644 --- a/engine/client/cl_tent.c +++ b/engine/client/cl_tent.c @@ -2793,19 +2793,15 @@ void CL_AddModelEffects( cl_entity_t *ent ) if( FBitSet( ent->model->flags, STUDIO_GIB )) R_RocketTrail( oldorigin, neworigin, 2 ); - - if( FBitSet( ent->model->flags, STUDIO_ZOMGIB )) + else if( FBitSet( ent->model->flags, STUDIO_ZOMGIB )) R_RocketTrail( oldorigin, neworigin, 4 ); - - if( FBitSet( ent->model->flags, STUDIO_TRACER )) + else if( FBitSet( ent->model->flags, STUDIO_TRACER )) R_RocketTrail( oldorigin, neworigin, 3 ); - - if( FBitSet( ent->model->flags, STUDIO_TRACER2 )) + else if( FBitSet( ent->model->flags, STUDIO_TRACER2 )) R_RocketTrail( oldorigin, neworigin, 5 ); - - if( FBitSet( ent->model->flags, STUDIO_ROCKET )) + else if( FBitSet( ent->model->flags, STUDIO_ROCKET )) { - dlight_t *dl = CL_AllocDlight( ent->index ); + dlight_t *dl = CL_AllocDlight( ent->curstate.number ); dl->color.r = dl->color.g = dl->color.b = 200; VectorCopy( ent->origin, dl->origin ); @@ -2819,11 +2815,9 @@ void CL_AddModelEffects( cl_entity_t *ent ) R_RocketTrail( oldorigin, neworigin, 0 ); } - - if( FBitSet( ent->model->flags, STUDIO_GRENADE )) + else if( FBitSet( ent->model->flags, STUDIO_GRENADE )) R_RocketTrail( oldorigin, neworigin, 1 ); - - if( FBitSet( ent->model->flags, STUDIO_TRACER3 )) + else if( FBitSet( ent->model->flags, STUDIO_TRACER3 )) R_RocketTrail( oldorigin, neworigin, 6 ); }