zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 14:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed broken Strife conversations

Browse source 
Check for in-combat flag was inverted
See http://forum.zdoom.org/viewtopic.php?t=51224
This commit is contained in:
alexey.lysiuk 2016-03-16 12:36:42 +02:00
parent a07f264782
commit 91ad7f5f2e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_map.cpp
View file

@ -4940,7 +4940,7 @@ bool P_TalkFacing(AActor *player)
if (t.linetarget != NULL) if (t.linetarget != NULL)
{ {
if (t.linetarget->health > 0 && // Dead things can't talk. 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) t.linetarget->Conversation != NULL)
{ {
// Give the NPC a chance to play a brief animation // Give the NPC a chance to play a brief animation