zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- completely removed fakePain check in case DoSpecialDamage returns -1. This signifies a special case that should bypass anything that inflicting pain implies.

This commit is contained in:
Christoph Oelckers 2015-03-27 11:55:11 +01:00
parent c78b9235a8
commit ac7abca6f8
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/p_interaction.cpp
View File

@ -1066,11 +1066,8 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
} }
} }
damage = inflictor->DoSpecialDamage (target, damage, mod); damage = inflictor->DoSpecialDamage (target, damage, mod);
if (damage == -1)
if ((damage == -1) && (target->player == NULL)) //This isn't meant for the player.
{ {
if (fakedPain) //Hold off ending the function before we can deal the pain chances.
goto fakepain;
return -1; return -1;
} }
} }