OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added Thomas's submissions for decal assignment to puffs and NOINFIGHTING flag.

Browse source 
SVN r847 (trunk)
This commit is contained in:
Christoph Oelckers 2008-03-24 22:06:26 +00:00
commit 1e81eb0fee
3 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_interaction.cpp
View file

@ -1270,8 +1270,9 @@ bool AActor::OkayToSwitchTarget (AActor *other)
}
int infight;
if (level.flags & LEVEL_TOTALINFIGHTING) infight=1;
else if (level.flags & LEVEL_NOINFIGHTING) infight=-1;
if (flags5 & MF5_NOINFIGHTING) infight=-1;
else if (level.flags & LEVEL_TOTALINFIGHTING) infight=1;
else if (level.flags & LEVEL_NOINFIGHTING) infight=-1;
else infight = infighting;
if (infight < 0 && other->player == NULL && !IsHostile (other))