From 1f6c6aafd91ca9d51c63a980b75fbba5002fb9f8 Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Sun, 1 Apr 2012 20:43:14 +0000 Subject: [PATCH] - Fixed: DesignatedTeams prevented monsters from hurting themselves in teamplay. SVN r3508 (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 9a85b786d7..bc563dced2 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -1092,7 +1092,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage // [RH] Avoid friendly fire if enabled if (!(flags & DMG_FORCED) && source != NULL && - ((player && player != source->player) || !player) && + ((player && player != source->player) || (!player && target != source)) && target->IsTeammate (source)) { if (player)