From 91ad7f5f2e2883f1cac6399332858d9a32e53548 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Wed, 16 Mar 2016 12:36:42 +0200
Subject: [PATCH] Fixed broken Strife conversations

Check for in-combat flag was inverted
See http://forum.zdoom.org/viewtopic.php?t=51224
---
 src/p_map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_map.cpp b/src/p_map.cpp
index 8c9b21055..aafe2d125 100644
--- a/src/p_map.cpp
+++ b/src/p_map.cpp
@@ -4940,7 +4940,7 @@ bool P_TalkFacing(AActor *player)
 		if (t.linetarget != NULL)
 		{
 			if (t.linetarget->health > 0 && // Dead things can't talk.
-				t.linetarget->flags4 & MF4_INCOMBAT && // Fighting things don't talk either.
+				!(t.linetarget->flags4 & MF4_INCOMBAT) && // Fighting things don't talk either.
 				t.linetarget->Conversation != NULL)
 			{
 				// Give the NPC a chance to play a brief animation