summaryrefslogtreecommitdiff
path: root/src/game/g_active.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/g_active.c')
-rw-r--r--src/game/g_active.c47
1 files changed, 37 insertions, 10 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c
index e909ca6..ec92c97 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -1534,6 +1534,42 @@ static void G_UnlaggedDetectCollisions( gentity_t *ent )
/*
==============
+ClientGradualFunds
+
+g_gradualFreeFunds values:
+0 - disabled
+1 - vanilla behavior
+2 - 1 and counters don't reset on death or evolution
+3 - 2 and funds are given even during SD
+==============
+*/
+static void ClientGradualFunds( gentity_t *ent )
+{
+ if( !g_gradualFreeFunds.integer )
+ return;
+
+ if( ent->client->pers.lastFreekillTime + FREEKILL_PERIOD >= level.time )
+ return;
+
+ if( g_suddenDeath.integer && g_gradualFreeFunds.integer < 3 )
+ return;
+
+ switch ( ent->client->ps.stats[ STAT_PTEAM ] )
+ {
+ case PTE_ALIENS:
+ G_AddCreditToClient( ent->client, FREEKILL_ALIEN, qtrue );
+ break;
+
+ case PTE_HUMANS:
+ G_AddCreditToClient( ent->client, FREEKILL_HUMAN, qtrue );
+ break;
+ }
+
+ ent->client->pers.lastFreekillTime += FREEKILL_PERIOD;
+}
+
+/*
+==============
ClientThink
This will be called once for each client frame, which will
@@ -1989,16 +2025,7 @@ void ClientThink_real( gentity_t *ent )
}
// Give clients some credit periodically
- if( ent->client->pers.lastFreekillTime + FREEKILL_PERIOD < level.time )
- {
- if( !g_suddenDeath.integer || g_gradualFreeFunds.integer ) {
- if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
- G_AddCreditToClient( ent->client, FREEKILL_ALIEN, qtrue );
- if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS )
- G_AddCreditToClient( ent->client, FREEKILL_HUMAN, qtrue );
- }
- ent->client->pers.lastFreekillTime += FREEKILL_PERIOD;
- }
+ ClientGradualFunds( ent );
// perform once-a-second actions
ClientTimerActions( ent, msec );