diff options
| author | Tim Angus <tim@ngus.net> | 2004-01-30 22:59:23 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2004-01-30 22:59:23 +0000 |
| commit | 5051ea08659f37593a9b6c4fe331d7ce49b2c55b (patch) | |
| tree | 05e349eda0588707cf605651bf0221de10805536 /src/game/g_weapon.c | |
| parent | 98efc09fa64329bfaba46c446b089ec7424eed10 (diff) | |
* Rethought custom footsteps a bit -- now includes clunk sounds
* Hydra can no longer grab someone with a battlesuit
Diffstat (limited to 'src/game/g_weapon.c')
| -rw-r--r-- | src/game/g_weapon.c | 7 |
1 files changed, 7 insertions, 0 deletions
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 ) ) { |