diff options
| author | Tim Angus <tim@ngus.net> | 2005-08-05 02:09:00 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2005-08-05 02:09:00 +0000 |
| commit | fe0d776b466a8787b0185f7683d0866891919b53 (patch) | |
| tree | 496be407fb5ad8e1ba6459d0da6062425df8d7e8 /src/game/g_weapon.c | |
| parent | f312c4912674b13fa07b8576f2e6c4ed96c9ec79 (diff) | |
* Disabled weapon dropping after buying ammo for now
* Basilisk now loosens grip if getting damaged
Diffstat (limited to 'src/game/g_weapon.c')
| -rw-r--r-- | src/game/g_weapon.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index 132bc83d..3518bb9c 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -813,7 +813,10 @@ void CheckGrabAttack( gentity_t *ent ) } traceEnt->client->ps.stats[ STAT_STATE ] |= SS_GRABBED; - traceEnt->client->lastGrabTime = level.time; + + //if getting damaged, don't reset the grab time + if( ( ent->client->lastDamageTime + ALIEN_REGEN_DAMAGE_TIME ) < level.time ) + traceEnt->client->lastGrabTime = level.time; } else if( traceEnt->s.eType == ET_BUILDABLE && traceEnt->s.modelindex == BA_H_MGTURRET ) |