mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 14:51:40 +00:00
Fixed broken Strife conversations
Check for in-combat flag was inverted See http://forum.zdoom.org/viewtopic.php?t=51224
This commit is contained in:
parent
a07f264782
commit
91ad7f5f2e
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue