From 24ac385d838d44ce64bfc35743f3d0d6ae137772 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 28 May 2011 06:53:04 +0000 Subject: [PATCH] - fixed: Telefrag damage should not be affected by skill damage factors. SVN r3218 (trunk) --- src/p_interaction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index 57f30d377..82ee2f221 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -949,7 +949,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage return; } player = target->player; - if (player && damage > 1) + if (player && damage > 1 && damage < TELEFRAG_DAMAGE) { // Take half damage in trainer mode damage = FixedMul(damage, G_SkillProperty(SKILLP_DamageFactor));