OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added GCC headers for intptr_t to tarray.h.

Browse source 
- Added MF5_PAINLESS flag for projectiles that don't make the target go into
  the pain state.


SVN r1446 (trunk)
This commit is contained in:
Christoph Oelckers 2009-02-24 21:19:10 +00:00
commit d91f0c4090
5 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/p_interaction.cpp
View file

@ -1193,7 +1193,8 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
}
}
if (!(target->flags5 & MF5_NOPAIN) && (pr_damagemobj() < painchance) && !(target->flags & MF_SKULLFLY))
if (!(target->flags5 & MF5_NOPAIN) && (inflictor == NULL || !(inflictor->flags5 & MF5_PAINLESS)) &&
(pr_damagemobj() < painchance) && !(target->flags & MF_SKULLFLY))
{
if (mod == NAME_Electric)
{