- fixed: Telefrag damage should not be affected by skill damage factors.

SVN r3218 (trunk)
This commit is contained in:
Christoph Oelckers 2011-05-28 06:53:04 +00:00
parent 60a411c9ad
commit 24ac385d83

View file

@ -949,7 +949,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
return; return;
} }
player = target->player; player = target->player;
if (player && damage > 1) if (player && damage > 1 && damage < TELEFRAG_DAMAGE)
{ {
// Take half damage in trainer mode // Take half damage in trainer mode
damage = FixedMul(damage, G_SkillProperty(SKILLP_DamageFactor)); damage = FixedMul(damage, G_SkillProperty(SKILLP_DamageFactor));