Skip to content

Commit

Permalink
- Fixed: SPECTRAL flag didn't check for DMG_FORCED before aborting Da…
Browse files Browse the repository at this point in the history
…mageMobj.
  • Loading branch information
MajorCooke authored and coelckers committed Mar 30, 2020
1 parent b4424b2 commit 09a5771
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/playsim/p_interaction.cpp
Expand Up @@ -1031,8 +1031,8 @@ static int DamageMobj (AActor *target, AActor *inflictor, AActor *source, int da
}
FName MeansOfDeath = mod;

// Spectral targets only take damage from spectral projectiles.
if (target->flags4 & MF4_SPECTRAL && !telefragDamage)
// Spectral targets only take damage from spectral projectiles unless forced or telefragging.
if ((target->flags4 & MF4_SPECTRAL) && !(flags & DMG_FORCED) && !telefragDamage)
{
if (inflictor == NULL || !(inflictor->flags4 & MF4_SPECTRAL))
{
Expand Down

0 comments on commit 09a5771

Please sign in to comment.