diff options
| author | Tim Angus <tim@ngus.net> | 2005-06-29 23:35:55 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2005-06-29 23:35:55 +0000 |
| commit | 7c13523d9b02f1319dec7dd0dece68f96f17ed35 (patch) | |
| tree | cbcfcc603bc34f8352a9a9bf021a5393ccf63821 /src/game/g_active.c | |
| parent | 0e56723b5c2e42c67bb12eca353caccc7a1a3886 (diff) | |
* Fixed a bug where menus would appear during demo playback
* Fixed a bug where delayed suicide would persist over death
* Reduced turret health and damage, increased range
* Generally strengthened alien buildable health and regen a little
* Increased damage that hives do
* Unlocked the trapper at stage 1
* Lev0 alien can now damage human defensive structures
* Booster now doubles alien regeneration rate
* Updated dependancies
Diffstat (limited to 'src/game/g_active.c')
| -rw-r--r-- | src/game/g_active.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 93360a12..ee5d1aa3 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -695,7 +695,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) vec3_t range = { LEVEL4_REGEN_RANGE, LEVEL4_REGEN_RANGE, LEVEL4_REGEN_RANGE }; vec3_t mins, maxs; int i, num; - gentity_t *alienPlayer; + gentity_t *boostEntity; float modifier = 1.0f; VectorAdd( client->ps.origin, range, maxs ); @@ -704,14 +704,20 @@ void ClientTimerActions( gentity_t *ent, int msec ) num = trap_EntitiesInBox( mins, maxs, entityList, MAX_GENTITIES ); for( i = 0; i < num; i++ ) { - alienPlayer = &g_entities[ entityList[ i ] ]; + boostEntity = &g_entities[ entityList[ i ] ]; - if( alienPlayer->client && alienPlayer->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS && - alienPlayer->client->ps.stats[ STAT_PCLASS ] == PCL_ALIEN_LEVEL4 ) + if( boostEntity->client && boostEntity->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS && + boostEntity->client->ps.stats[ STAT_PCLASS ] == PCL_ALIEN_LEVEL4 ) { modifier = LEVEL4_REGEN_MOD; break; } + else if( boostEntity->s.eType == ET_BUILDABLE && + boostEntity->s.modelindex == BA_A_BOOSTER ) + { + modifier = BOOSTER_REGEN_MOD; + break; + } } if( ent->health < client->ps.stats[ STAT_MAX_HEALTH ] && |