diff options
Diffstat (limited to 'src/game/g_combat.c')
| -rw-r--r-- | src/game/g_combat.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c index eb17c7e2..e95722c2 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -926,11 +926,6 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, attacker->client->ps.persistant[ PERS_HITS ]++; } - // always give half damage if hurting self - // calculated after knockback, so rocket jumping works - if( targ == attacker) - damage *= 0.5; - if( damage < 1 ) damage = 1; @@ -1000,7 +995,10 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, } if( targ->client ) + { targ->client->ps.stats[ STAT_HEALTH ] = targ->health; + targ->client->lastDamageTime = level.time; + } //TA: add to the attackers "account" on the target if( targ->client && attacker->client && |