diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2015-04-09 17:09:46 +0200 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2015-04-09 17:09:46 +0200 |
| commit | 57ee720912a9074c5d1b2b9323d9f243d17a1973 (patch) | |
| tree | 87203f7b3e2ea01f5726af59379ea0f1395dd685 /src/game/g_buildable.c | |
| parent | 633697f8fb26930f4f3dc089726d76fed99595a3 (diff) | |
| parent | aa8684be7efeec63cce394265609834e06bc68fa (diff) | |
Merge branch 'vq3-humans'
Diffstat (limited to 'src/game/g_buildable.c')
| -rw-r--r-- | src/game/g_buildable.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 21f5424..fa66979 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -2830,8 +2830,7 @@ void HMedistat_Think( gentity_t *self ) if( player->client && player->client->ps.stats[ STAT_TEAM ] == TEAM_HUMANS ) { - if( ( player->health < player->client->ps.stats[ STAT_MAX_HEALTH ] || - player->client->ps.stats[ STAT_STAMINA ] < STAMINA_MAX ) && + if( player->health < player->client->ps.stats[ STAT_MAX_HEALTH ] && PM_Live( player->client->ps.pm_type ) ) { self->enemy = player; @@ -2861,12 +2860,6 @@ void HMedistat_Think( gentity_t *self ) } else if( self->enemy && self->enemy->client ) //heal! { - if( self->enemy->client->ps.stats[ STAT_STAMINA ] < STAMINA_MAX ) - self->enemy->client->ps.stats[ STAT_STAMINA ] += STAMINA_MEDISTAT_RESTORE; - - if( self->enemy->client->ps.stats[ STAT_STAMINA ] > STAMINA_MAX ) - self->enemy->client->ps.stats[ STAT_STAMINA ] = STAMINA_MAX; - self->enemy->health++; //if they're completely healed, give them a medkit |