From 5051ea08659f37593a9b6c4fe331d7ce49b2c55b Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Fri, 30 Jan 2004 22:59:23 +0000
Subject: * Rethought custom footsteps a bit -- now includes clunk sounds *
 Hydra can no longer grab someone with a battlesuit

---
 src/game/g_weapon.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/game')

diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index e5130a43..cadaab49 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -725,12 +725,19 @@ void CheckGrabAttack( gentity_t *ent )
 
   if( !traceEnt->takedamage )
     return;
+  
   if( !traceEnt->client )
     return;
+  
   if( traceEnt->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
     return;
+  
   if( traceEnt->client->ps.stats[ STAT_HEALTH ] <= 0 )
     return;
+
+  //can't grab a player with the battlesuit
+  if( BG_gotItem( UP_BATTLESUIT, traceEnt->client->ps.stats ) )
+    return;
     
   if( !( traceEnt->client->ps.stats[ STAT_STATE ] & SS_GRABBED ) )
   {
-- 
cgit