summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2014-07-13 21:04:51 +0200
committer/dev/humancontroller <devhc@example.com>2017-03-09 13:51:14 +0100
commitc823eaf3beb186dc4cf42fb4a41be1291069d77a (patch)
tree7cf7bb0c000376db13e159721ebfb9330ebedb25
parenteb95d5b561d44d5ead7d9f524f6cf449add9eac1 (diff)
allow misc_particle_system entities to use the angles spawn variable
-rw-r--r--src/cgame/cg_particles.c3
-rw-r--r--src/game/g_misc.c1
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( &cent->entityPS ) )
{
- CG_SetAttachmentPoint( &cent->entityPS->attachment, cent->lerpOrigin );
CG_SetAttachmentCent( &cent->entityPS->attachment, cent );
- CG_AttachToPoint( &cent->entityPS->attachment );
+ CG_AttachToCent( &cent->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 );