zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-30 07:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

SVN r548 (trunk)

Browse source
This commit is contained in:
Christoph Oelckers 2007-09-25 23:49:20 +00:00
parent 09f5bbc2d3
commit 7539d5ad70
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_mobj.cpp
View file

@ -866,7 +866,7 @@ void AActor::CopyFriendliness (const AActor *other, bool changeTarget)
flags3 = (flags3 & ~(MF3_NOSIGHTCHECK | MF3_HUNTPLAYERS)) | (other->flags3 & (MF3_NOSIGHTCHECK | MF3_HUNTPLAYERS)); flags3 = (flags3 & ~(MF3_NOSIGHTCHECK | MF3_HUNTPLAYERS)) | (other->flags3 & (MF3_NOSIGHTCHECK | MF3_HUNTPLAYERS));
flags4 = (flags4 & ~MF4_NOHATEPLAYERS) | (other->flags4 & MF4_NOHATEPLAYERS); flags4 = (flags4 & ~MF4_NOHATEPLAYERS) | (other->flags4 & MF4_NOHATEPLAYERS);
FriendPlayer = other->FriendPlayer; 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 must be set as well so that A_Look can react to the new target if called
LastHeard = target = other->target; LastHeard = target = other->target;