zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-07 08:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed armor bonus giving in A_CustomPunch

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-22 00:36:15 +01:00
parent 5a054da4d9
commit f6ce5f59ae
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
wadsrc/static/zscript/inventory/stateprovider.txt
View file

@ -297,15 +297,18 @@ class StateProvider : Inventory
} }
if (armorbonustype != NULL) if (armorbonustype != NULL)
{ {
let armorbonus = ArmorBonus(Spawn(armorbonustype)); let armorbonus = BasicArmorBonus(Spawn(armorbonustype));
armorbonus.SaveAmount *= int(actualdamage * lifesteal); if (armorbonus)
if (lifestealmax > 0) armorbonus.MaxSaveAmount = lifestealmax;
armorbonus.bDropped = true;
armorbonus.ClearCounters();
if (!armorbonus.CallTryPickup(self))
{ {
armorbonus.Destroy (); armorbonus.SaveAmount *= int(actualdamage * lifesteal);
if (lifestealmax > 0) armorbonus.MaxSaveAmount = lifestealmax;
armorbonus.bDropped = true;
armorbonus.ClearCounters();
if (!armorbonus.CallTryPickup(self))
{
armorbonus.Destroy ();
}
} }
} }
} }