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

- Fixed NODAMAGE not ignoring telefrag damage.

This commit is contained in:
MajorCooke 2015-04-01 10:31:47 -05:00
parent 74f4ae86d8
commit e70aae91e3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_interaction.cpp
View File

@ -1119,12 +1119,12 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
return -1; return -1;
} }
} }
}
if (target->flags5 & MF5_NODAMAGE) if (target->flags5 & MF5_NODAMAGE)
{ {
damage = 0; damage = 0;
} }
} }
}
if (damage < 0) if (damage < 0)
{ {
// any negative value means that something in the above chain has cancelled out all damage and all damage effects, including pain. // any negative value means that something in the above chain has cancelled out all damage and all damage effects, including pain.