mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 23:01:50 +00:00
SVN r548 (trunk)
This commit is contained in:
parent
09f5bbc2d3
commit
7539d5ad70
1 changed files with 1 additions and 1 deletions
|
@ -866,7 +866,7 @@ void AActor::CopyFriendliness (const AActor *other, bool changeTarget)
|
|||
flags3 = (flags3 & ~(MF3_NOSIGHTCHECK | MF3_HUNTPLAYERS)) | (other->flags3 & (MF3_NOSIGHTCHECK | MF3_HUNTPLAYERS));
|
||||
flags4 = (flags4 & ~MF4_NOHATEPLAYERS) | (other->flags4 & MF4_NOHATEPLAYERS);
|
||||
FriendPlayer = other->FriendPlayer;
|
||||
if (changeTarget && !(other->target->flags3 & MF3_NOTARGET))
|
||||
if (changeTarget && other->target != NULL && !(other->target->flags3 & MF3_NOTARGET))
|
||||
{
|
||||
// LastHeard must be set as well so that A_Look can react to the new target if called
|
||||
LastHeard = target = other->target;
|
||||
|
|
Loading…
Reference in a new issue