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

1
src/p_map.cpp
View file

@ -1177,6 +1177,7 @@ static bool CanAttackHurt(AActor *victim, AActor *shooter)
if (!victim->player && !shooter->player)
{
int infight = G_SkillProperty(SKILLP_Infight);
if (infight < 0 && (victim->flags7 & MF7_FORCEINFIGHTING)) infight = 0; // This must override the 'no infight' setting to take effect.
if (infight < 0)
{