OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'maint' into scripting

Browse source
This commit is contained in:
Christoph Oelckers 2013-07-28 10:47:17 +02:00
commit 909ec2e35a
8 changed files with 119 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_interaction.cpp
View file

@ -960,7 +960,7 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
{ // actor is invulnerable
if (target->player == NULL)
{
if (inflictor == NULL || !(inflictor->flags3 & MF3_FOILINVUL))
if (inflictor == NULL || (!(inflictor->flags3 & MF3_FOILINVUL) && !(flags & DMG_FOILINVUL)))
{
return -1;
}