diff options
| author | Tim Angus <tim@ngus.net> | 2001-09-15 03:42:41 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2001-09-15 03:42:41 +0000 |
| commit | cab6cb5c4a989b11e6f45b74f87d84a961235984 (patch) | |
| tree | fa10bd39de3cfbad896ad63a260b3d07c164bdb3 /src/game/g_active.c | |
| parent | 5e95698bb34a46c68bae1f5f1c089bf794e5a43d (diff) | |
Trapper buildable. Other fixes/tweaks
Diffstat (limited to 'src/game/g_active.c')
| -rw-r--r-- | src/game/g_active.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 2a9e27fb..95b638b3 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -814,14 +814,20 @@ void ClientThink_real( gentity_t *ent ) { client->ps.pm_type = PM_DEAD; else if( client->ps.stats[ STAT_STATE ] & SS_INFESTING ) client->ps.pm_type = PM_FREEZE; - else if( client->ps.stats[ STAT_STATE ] & SS_GRABBED ) + else if( client->ps.stats[ STAT_STATE ] & SS_BLOBLOCKED || + client->ps.stats[ STAT_STATE ] & SS_GRABBED ) client->ps.pm_type = PM_GRABBED; else client->ps.pm_type = PM_NORMAL; - if( client->ps.stats[ STAT_STATE ] & SS_GRABBED && client->lastGrabTime + 500 < level.time ) + if( client->ps.stats[ STAT_STATE ] & SS_GRABBED && + client->lastGrabTime + 500 < level.time ) client->ps.stats[ STAT_STATE ] &= ~SS_GRABBED; + if( client->ps.stats[ STAT_STATE ] & SS_BLOBLOCKED && + client->lastLockTime + 5000 < level.time ) + client->ps.stats[ STAT_STATE ] &= ~SS_BLOBLOCKED; + client->ps.gravity = g_gravity.value; // set speed |