diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2015-06-22 15:53:59 +0200 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2015-06-22 15:53:59 +0200 |
| commit | 4f02df7e08cd3f16e3e1a048749b0c688346a60a (patch) | |
| tree | afc7357a887ff5dc30b6a388232a864e712d68ed /src/game/g_active.c | |
| parent | 451f2ca7c8d832d2691dde2510e613373c312cd1 (diff) | |
Remove Trapper.
Diffstat (limited to 'src/game/g_active.c')
| -rw-r--r-- | src/game/g_active.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 1a28de7..a1d7944 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -1637,9 +1637,6 @@ void ClientThink_real( gentity_t *ent ) client->ps.pm_type = PM_NOCLIP; else if( client->ps.stats[ STAT_HEALTH ] <= 0 ) client->ps.pm_type = PM_DEAD; - else if( client->ps.stats[ STAT_STATE ] & SS_BLOBLOCKED || - client->ps.stats[ STAT_STATE ] & SS_GRABBED ) - client->ps.pm_type = PM_GRABBED; else if( BG_InventoryContainsUpgrade( UP_JETPACK, client->ps.stats ) && BG_UpgradeIsActive( UP_JETPACK, client->ps.stats ) ) client->ps.pm_type = PM_JETPACK; else if( client->ps.weapon == WP_ALEVEL5 && G_Overmind() ) @@ -1648,14 +1645,6 @@ void ClientThink_real( gentity_t *ent ) else client->ps.pm_type = PM_NORMAL; - if( ( client->ps.stats[ STAT_STATE ] & SS_GRABBED ) && - client->grabExpiryTime < level.time ) - client->ps.stats[ STAT_STATE ] &= ~SS_GRABBED; - - if( ( client->ps.stats[ STAT_STATE ] & SS_BLOBLOCKED ) && - client->lastLockTime + LOCKBLOB_LOCKTIME < level.time ) - client->ps.stats[ STAT_STATE ] &= ~SS_BLOBLOCKED; - if( ( client->ps.stats[ STAT_STATE ] & SS_SLOWLOCKED ) && client->lastSlowTime + ABUILDER_BLOB_TIME < level.time ) client->ps.stats[ STAT_STATE ] &= ~SS_SLOWLOCKED; |