summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2010-03-06 23:23:02 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:17:30 +0000
commit2a7581bf0b216d16d90ae4821db6182f192f6f8c (patch)
tree2ed4e928945dfb09f9b1997f6252759bbff0dc06 /src
parent74cb834f9754adfa396a09ca5b04114f12f13fb1 (diff)
* Put back some grenade bounce code that was not actually redundant after all (was removed in r1977)
Diffstat (limited to 'src')
-rw-r--r--src/game/g_missile.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/game/g_missile.c b/src/game/g_missile.c
index 458b6d3f..58bd9380 100644
--- a/src/game/g_missile.c
+++ b/src/game/g_missile.c
@@ -126,7 +126,18 @@ void G_MissileImpact( gentity_t *ent, trace_t *trace )
return;
}
- if( !strcmp( ent->classname, "lockblob" ) )
+ if( !strcmp( ent->classname, "grenade" ) )
+ {
+ //grenade doesn't explode on impact
+ G_BounceMissile( ent, trace );
+
+ //only play a sound if requested
+ if( !( ent->s.eFlags & EF_NO_BOUNCE_SOUND ) )
+ G_AddEvent( ent, EV_GRENADE_BOUNCE, 0 );
+
+ return;
+ }
+ else if( !strcmp( ent->classname, "lockblob" ) )
{
if( other->client && other->client->ps.stats[ STAT_TEAM ] == TEAM_HUMANS )
{