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

- Fixed: SPECTRAL flag didn't check for DMG_FORCED before aborting DamageMobj.

This commit is contained in:
Major Cooke 2020-03-29 10:41:13 -05:00 committed by Christoph Oelckers
parent b4424b2d4d
commit 09a5771ad4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/playsim/p_interaction.cpp
View File

@ -1031,8 +1031,8 @@ static int DamageMobj (AActor *target, AActor *inflictor, AActor *source, int da
} }
FName MeansOfDeath = mod; FName MeansOfDeath = mod;
// Spectral targets only take damage from spectral projectiles. // Spectral targets only take damage from spectral projectiles unless forced or telefragging.
if (target->flags4 & MF4_SPECTRAL && !telefragDamage) if ((target->flags4 & MF4_SPECTRAL) && !(flags & DMG_FORCED) && !telefragDamage)
{ {
if (inflictor == NULL || !(inflictor->flags4 & MF4_SPECTRAL)) if (inflictor == NULL || !(inflictor->flags4 & MF4_SPECTRAL))
{ {