From c823eaf3beb186dc4cf42fb4a41be1291069d77a Mon Sep 17 00:00:00 2001 From: /dev/humancontroller Date: Sun, 13 Jul 2014 21:04:51 +0200 Subject: allow misc_particle_system entities to use the angles spawn variable --- src/cgame/cg_particles.c | 3 +-- src/game/g_misc.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cgame/cg_particles.c b/src/cgame/cg_particles.c index f3a63efd..6b85ec93 100644 --- a/src/cgame/cg_particles.c +++ b/src/cgame/cg_particles.c @@ -2445,9 +2445,8 @@ void CG_ParticleSystemEntity( centity_t *cent ) if( CG_IsParticleSystemValid( ¢->entityPS ) ) { - CG_SetAttachmentPoint( ¢->entityPS->attachment, cent->lerpOrigin ); CG_SetAttachmentCent( ¢->entityPS->attachment, cent ); - CG_AttachToPoint( ¢->entityPS->attachment ); + CG_AttachToCent( ¢->entityPS->attachment ); } else cent->entityPSMissing = qtrue; diff --git a/src/game/g_misc.c b/src/game/g_misc.c index fa2c8705..3f7b132b 100644 --- a/src/game/g_misc.c +++ b/src/game/g_misc.c @@ -281,6 +281,7 @@ void SP_misc_particle_system( gentity_t *self ) char *s; G_SetOrigin( self, self->s.origin ); + VectorCopy( self->s.angles, self->s.apos.trBase ); G_SpawnString( "psName", "", &s ); G_SpawnFloat( "wait", "0", &self->wait ); -- cgit