OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- allow specifying infighting through skills.

Browse source
This commit is contained in:
Christoph Oelckers 2015-11-29 12:10:12 +01:00
commit 1ad02a6ce8
4 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_map.cpp
View file

@ -938,10 +938,7 @@ static bool CanAttackHurt(AActor *victim, AActor *shooter)
// to harm / be harmed by anything.
if (!victim->player && !shooter->player)
{
int infight;
if (level.flags2 & LEVEL2_TOTALINFIGHTING) infight = 1;
else if (level.flags2 & LEVEL2_NOINFIGHTING) infight = -1;
else infight = infighting;
int infight = G_SkillProperty(SKILLP_Infight);
if (infight < 0)
{