From 02fe20824c8fc7fbbe6086d23ac34ca7c7e02192 Mon Sep 17 00:00:00 2001
From: Ben Millwood <thebenmachine@gmail.com>
Date: Wed, 3 Mar 2010 19:26:07 +0000
Subject: * Apply the fix in r1917 to another case * Excise some redundant
 bounce code

---
 src/game/g_missile.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/game/g_missile.c b/src/game/g_missile.c
index 43cc9ec9..458b6d3f 100644
--- a/src/game/g_missile.c
+++ b/src/game/g_missile.c
@@ -126,18 +126,7 @@ void G_MissileImpact( gentity_t *ent, trace_t *trace )
     return;
   }
 
-  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( !strcmp( ent->classname, "lockblob" ) )
   {
     if( other->client && other->client->ps.stats[ STAT_TEAM ] == TEAM_HUMANS )
     {
@@ -268,8 +257,7 @@ void G_RunMissile( gentity_t *ent )
 
   if( tr.fraction < 1.0f )
   {
-    if( !ent->pointAgainstWorld || tr.contents & CONTENTS_BODY || 
-        ( tr.entityNum >= 0 && tr.entityNum != ENTITYNUM_WORLD ) )
+    if( !ent->pointAgainstWorld || tr.contents & CONTENTS_BODY )
     {
       // We hit an entity or we don't care
       impact = qtrue;
-- 
cgit