diff options
| -rw-r--r-- | src/game/g_active.c | 2 | ||||
| -rw-r--r-- | src/game/g_combat.c | 4 | ||||
| -rw-r--r-- | src/game/g_local.h | 1 | ||||
| -rw-r--r-- | src/game/g_main.c | 2 | ||||
| -rw-r--r-- | src/game/tremulous.h | 6 |
5 files changed, 7 insertions, 8 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 30171f53..097370d2 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -1749,7 +1749,7 @@ void ClientThink_real( gentity_t *ent ) client->ps.persistant[ PERS_BP ] = 0; // Give clients some credit periodically - if( ent->client->lastKillTime + FREEKILL_PERIOD < level.time ) + if( ent->client->lastKillTime + g_freeKillPeriod.integer < level.time ) { if( G_TimeTilSuddenDeath( ) <= 0 ) { diff --git a/src/game/g_combat.c b/src/game/g_combat.c index ff1af0bf..fef3c6f5 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -295,10 +295,6 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int AddScore( attacker, -HUMAN_TK_SUICIDE_PENALTY ); } } - else - { - attacker->client->lastKillTime = level.time; - } } else if( attacker->s.eType != ET_BUILDABLE ) { diff --git a/src/game/g_local.h b/src/game/g_local.h index ce59a70b..9d82c72b 100644 --- a/src/game/g_local.h +++ b/src/game/g_local.h @@ -1097,6 +1097,7 @@ extern vmCvar_t g_alienCredits; extern vmCvar_t g_alienMaxStage; extern vmCvar_t g_alienStage2Threshold; extern vmCvar_t g_alienStage3Threshold; +extern vmCvar_t g_freeKillPeriod; extern vmCvar_t g_unlagged; diff --git a/src/game/g_main.c b/src/game/g_main.c index 130e6edb..cc11ee5c 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -104,6 +104,7 @@ vmCvar_t g_alienCredits; vmCvar_t g_alienMaxStage; vmCvar_t g_alienStage2Threshold; vmCvar_t g_alienStage3Threshold; +vmCvar_t g_freeKillPeriod; vmCvar_t g_unlagged; @@ -242,6 +243,7 @@ static cvarTable_t gameCvarTable[ ] = { &g_alienMaxStage, "g_alienMaxStage", DEFAULT_ALIEN_MAX_STAGE, 0, 0, qfalse }, { &g_alienStage2Threshold, "g_alienStage2Threshold", DEFAULT_ALIEN_STAGE2_THRESH, 0, 0, qfalse }, { &g_alienStage3Threshold, "g_alienStage3Threshold", DEFAULT_ALIEN_STAGE3_THRESH, 0, 0, qfalse }, + { &g_freeKillPeriod, "g_freeKillPeriod", DEFAULT_FREEKILL_PERIOD, CVAR_ARCHIVE, 0, qtrue }, { &g_unlagged, "g_unlagged", "1", CVAR_SERVERINFO | CVAR_ARCHIVE, 0, qfalse }, diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 358040a5..8f66ac24 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -657,9 +657,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define MAX_FALL_DISTANCE 120.0f //the fall distance at which maximum damage is dealt #define AVG_FALL_DISTANCE ((MIN_FALL_DISTANCE+MAX_FALL_DISTANCE)/2.0f) -#define FREEKILL_PERIOD 120000 //msec -#define FREEKILL_ALIEN 0 -#define FREEKILL_HUMAN 0 +#define DEFAULT_FREEKILL_PERIOD "120000" //msec +#define FREEKILL_ALIEN ALIEN_CREDITS_PER_KILL +#define FREEKILL_HUMAN LEVEL0_VALUE #define DEFAULT_ALIEN_BUILDPOINTS "150" #define DEFAULT_ALIEN_QUEUE_TIME "12000" |