OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Moved MF4_BOSSSPAWNED flag copying from A_PainShootSkull to AActor::CopyFriendliness().

Browse source 
SVN r4063 (trunk)
This commit is contained in:
Randy Heit 2013-02-05 02:33:11 +00:00
commit 2f3dd8d959
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_mobj.cpp
View file

@ -820,7 +820,7 @@ void AActor::CopyFriendliness (AActor *other, bool changeTarget, bool resetHealt
LastLookPlayerNumber = other->LastLookPlayerNumber;
flags = (flags & ~MF_FRIENDLY) | (other->flags & MF_FRIENDLY);
flags3 = (flags3 & ~(MF3_NOSIGHTCHECK | MF3_HUNTPLAYERS)) | (other->flags3 & (MF3_NOSIGHTCHECK | MF3_HUNTPLAYERS));
flags4 = (flags4 & ~MF4_NOHATEPLAYERS) | (other->flags4 & MF4_NOHATEPLAYERS);
flags4 = (flags4 & ~(MF4_NOHATEPLAYERS | MF4_BOSSSPAWNED)) | (other->flags4 & (MF4_NOHATEPLAYERS | MF4_BOSSSPAWNED));
FriendPlayer = other->FriendPlayer;
DesignatedTeam = other->DesignatedTeam;
if (changeTarget && other->target != NULL && !(other->target->flags3 & MF3_NOTARGET))