OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: With the recent changes to the damage code, the check for MF5_NODAMAGE was too early. Putting it into AActor::TakeSpecialDamage is also not the best idea because that limits that function's potential.

Browse source
This commit is contained in:
Christoph Oelckers 2015-03-31 23:15:43 +02:00
commit d940c6a2ee
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_interaction.cpp
View file

@ -1038,6 +1038,7 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
// Invulnerable, and won't wake up
return -1;
}
if (damage < TELEFRAG_DAMAGE) // TELEFRAG_DAMAGE may not be reduced at all or it may not guarantee its effect.
{
player = target->player;
@ -1116,6 +1117,10 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
return -1;
}
}
if (target->flags5 & MF5_NODAMAGE)
{
damage = 0;
}
}
}
if (damage < 0)