OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Added source, inflictor and damage flags to AbsorbDamage.

Browse source
This commit is contained in:
Major Cooke 2020-02-06 12:18:46 -06:00 • committed by Christoph Oelckers
commit 39a9a48ad6
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/playsim/p_interaction.cpp
View file

@ -1301,7 +1301,7 @@ static int DamageMobj (AActor *target, AActor *inflictor, AActor *source, int da
int newdam = damage;
if (damage > 0)
{
newdam = player->mo->AbsorbDamage(damage, mod);
newdam = player->mo->AbsorbDamage(damage, mod, inflictor, source, flags);
}
if (!telefragDamage || (player->mo->flags7 & MF7_LAXTELEFRAGDMG)) //rawdamage is never modified.
{
@ -1371,7 +1371,7 @@ static int DamageMobj (AActor *target, AActor *inflictor, AActor *source, int da
if (!(flags & (DMG_NO_ARMOR|DMG_FORCED)) && target->Inventory != NULL && damage > 0)
{
int newdam = damage;
newdam = target->AbsorbDamage(damage, mod);
newdam = target->AbsorbDamage(damage, mod, inflictor, source, flags);
damage = newdam;
if (damage <= 0)
{