diff options
| author | Mikko Tiusanen <ams@daug.net> | 2014-08-20 20:32:12 +0300 |
|---|---|---|
| committer | Mikko Tiusanen <ams@daug.net> | 2014-08-20 20:32:12 +0300 |
| commit | 613030b05c409cef42b0e98d5180a41f8f67c661 (patch) | |
| tree | 480cdbf625d7dcce1bb5477ab1dca6c9d8102106 /src/cgame/cg_particles.c | |
| parent | 7ad16ee1fea76bab54d97a78c1063b7c2c2adef6 (diff) | |
| parent | 0a382e146ac52e111c90ad1e093ade77b710d993 (diff) | |
Merge branch 'master' of https://github.com/mtiusane/new-edge
Diffstat (limited to 'src/cgame/cg_particles.c')
| -rw-r--r-- | src/cgame/cg_particles.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/cgame/cg_particles.c b/src/cgame/cg_particles.c index c2374c7..b718600 100644 --- a/src/cgame/cg_particles.c +++ b/src/cgame/cg_particles.c @@ -2156,6 +2156,19 @@ static void CG_EvaluateParticlePhysics( particle_t *p ) return; } + if( bp->bounceMarkName[ 0 ] && p->bounceMarkCount > 0 ) + { + CG_ImpactMark( bp->bounceMark, trace.endpos, trace.plane.normal, + random( ) * 360, 1, 1, 1, 1, qtrue, bp->bounceMarkRadius, qfalse ); + p->bounceMarkCount--; + } + + if( bp->bounceSoundName[ 0 ] && p->bounceSoundCount > 0 ) + { + trap_S_StartSound( trace.endpos, ENTITYNUM_WORLD, CHAN_AUTO, bp->bounceSound ); + p->bounceSoundCount--; + } + //remove particles that get into a CONTENTS_NODROP brush if( ( trap_CM_PointContents( trace.endpos, 0 ) & CONTENTS_NODROP ) || ( bp->cullOnStartSolid && trace.startsolid ) ) |