OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added a FORCEINFIGHTING flag.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-26 19:05:20 +01:00
commit 0cc46a2aaf
4 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/p_interaction.cpp
View file

@ -1772,7 +1772,8 @@ bool AActor::OkayToSwitchTarget (AActor *other)
}
int infight;
if (flags5 & MF5_NOINFIGHTING) infight=-1;
if (flags7 & MF7_FORCEINFIGHTING) infight = 1;
else if (flags5 & MF5_NOINFIGHTING) infight = -1;
else infight = G_SkillProperty(SKILLP_Infight);
if (infight < 0 && other->player == NULL && !IsHostile (other))