diff options
| author | Tim Angus <tim@ngus.net> | 2005-01-31 23:50:01 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2005-01-31 23:50:01 +0000 |
| commit | b74ecca6018899011380bf807a22b4df92dabf39 (patch) | |
| tree | b1d77adb840ce31b5ced6c8baf1966462cba462b /src/game/g_combat.c | |
| parent | f9c64820ad26030864651661ac39dba3d770c85b (diff) | |
* An overmind is now required for aliens to upgrade
* Damaged aliens now need a couple of seconds before they can regenerate
* Very slightly increased human buildable health in general
* Increased armoury and turret health a wee bit more significantly
* Classes which suicide/teamkill don't get taken into account for credit anymore
* Reduced chaingun damage slightly
* Increased angular speed of turrets
Diffstat (limited to 'src/game/g_combat.c')
| -rw-r--r-- | src/game/g_combat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 93b8c21c..185b201d 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -1099,7 +1099,10 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, //TA: add to the attackers "account" on the target if( targ->client && attacker->client ) - targ->credits[ attacker->client->ps.clientNum ] += take; + { + if( attacker != targ && !OnSameTeam( targ, attacker ) ) + targ->credits[ attacker->client->ps.clientNum ] += take; + } if( targ->health <= 0 ) { |