From b1d935932689ac3b71036288a015f76dddba753d Mon Sep 17 00:00:00 2001 From: Paweł Redman Date: Wed, 8 Apr 2020 11:59:46 +0200 Subject: SD reward penalities and bonuses --- src/game/g_active.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/game/g_active.c') diff --git a/src/game/g_active.c b/src/game/g_active.c index b4fc9ee..c857e57 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -888,6 +888,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) ent->health = client->ps.stats[ STAT_MAX_HEALTH ]; } + ent->client->nearBase = qfalse; if( ent->client->ps.stats[ STAT_HEALTH ] > 0 && ent->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS ) { @@ -897,16 +898,19 @@ void ClientTimerActions( gentity_t *ent, int msec ) { ent->client->pers.statscounters.timeinbase++; level.alienStatsCounters.timeinbase++; + ent->client->nearBase = qtrue; } if( BG_ClassHasAbility( ent->client->ps.stats[ STAT_PCLASS ], SCA_WALLCLIMBER ) ) { ent->client->pers.statscounters.dretchbasytime++; level.alienStatsCounters.dretchbasytime++; - if( ent->client->ps.stats[ STAT_STATE ] & SS_WALLCLIMBING || ent->client->ps.stats[ STAT_STATE ] & SS_WALLCLIMBINGCEILING) - { - ent->client->pers.statscounters.jetpackusewallwalkusetime++; - level.alienStatsCounters.jetpackusewallwalkusetime++; - } + + if( ent->client->ps.stats[ STAT_STATE ] & SS_WALLCLIMBING + || ent->client->ps.stats[ STAT_STATE ] & SS_WALLCLIMBINGCEILING ) + { + ent->client->pers.statscounters.jetpackusewallwalkusetime++; + level.alienStatsCounters.jetpackusewallwalkusetime++; + } } } else if( ent->client->ps.stats[ STAT_HEALTH ] > 0 && ent->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) @@ -917,6 +921,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) { ent->client->pers.statscounters.timeinbase++; level.humanStatsCounters.timeinbase++; + ent->client->nearBase = qtrue; } if( BG_InventoryContainsUpgrade( UP_JETPACK, client->ps.stats ) ) { -- cgit