diff options
| author | Tim Angus <tim@ngus.net> | 2003-09-03 22:50:40 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2003-09-03 22:50:40 +0000 |
| commit | 8184497c1610bc9ac6727315d2981b83a5a32ae6 (patch) | |
| tree | 18cc558560980ae5777848acc3fa99659e780c6a /src/game/g_active.c | |
| parent | adbcbeb9156141e02d182d00d91330f3f523664a (diff) | |
* Jetpack handling rejigged a bit to cooperate with other move types better
* All upgrades are deactivated upon death now
* Bodies no longer dtf but have their model origins matched with the player
Diffstat (limited to 'src/game/g_active.c')
| -rw-r--r-- | src/game/g_active.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 4fd29f84..8f1971b7 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -888,7 +888,7 @@ void ClientThink_real( gentity_t *ent ) if( client->noclip ) client->ps.pm_type = PM_NOCLIP; - else if( client->ps.stats[STAT_HEALTH] <= 0 ) + else if( client->ps.stats[ STAT_HEALTH ] <= 0 ) client->ps.pm_type = PM_DEAD; else if( client->ps.stats[ STAT_STATE ] & SS_INFESTING || client->ps.stats[ STAT_STATE ] & SS_HOVELING ) @@ -896,6 +896,8 @@ void ClientThink_real( gentity_t *ent ) 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_gotItem( UP_JETPACK, client->ps.stats ) && BG_activated( UP_JETPACK, client->ps.stats ) ) + client->ps.pm_type = PM_JETPACK; else client->ps.pm_type = PM_NORMAL; |