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

6
src/playsim/p_mobj.cpp
View file

@ -3231,14 +3231,14 @@ bool AActor::AdjustReflectionAngle (AActor *thing, DAngle &angle)
return false;
}
int AActor::AbsorbDamage(int damage, FName dmgtype)
int AActor::AbsorbDamage(int damage, FName dmgtype, AActor *inflictor, AActor *source, int flags)
{
for (AActor *item = Inventory; item != nullptr; item = item->Inventory)
{
IFVIRTUALPTRNAME(item, NAME_Inventory, AbsorbDamage)
{
VMValue params[4] = { item, damage, dmgtype.GetIndex(), &damage };
VMCall(func, params, 4, nullptr, 0);
VMValue params[7] = { item, damage, dmgtype.GetIndex(), &damage, inflictor, source, flags };
VMCall(func, params, 7, nullptr, 0);
}
}
return damage;