zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-02-22 11:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: AInventory::AbsorbDamage may only be called for positive damage values, otherwise it ends up adding armor points.

Browse source
This commit is contained in:
Christoph Oelckers 2015-01-20 10:25:58 +01:00
parent db25322b4c
commit 67312b907b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_interaction.cpp
View file

@ -1278,7 +1278,10 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
if (!(flags & DMG_NO_ARMOR) && player->mo->Inventory != NULL) if (!(flags & DMG_NO_ARMOR) && player->mo->Inventory != NULL)
{ {
int newdam = damage; int newdam = damage;
player->mo->Inventory->AbsorbDamage(damage, mod, newdam); if (damage > 0)
{
player->mo->Inventory->AbsorbDamage(damage, mod, newdam);
}
if (damage < TELEFRAG_DAMAGE) if (damage < TELEFRAG_DAMAGE)
{ {
// if we are telefragging don't let the damage value go below that magic value. Some further checks would fail otherwise. // if we are telefragging don't let the damage value go below that magic value. Some further checks would fail otherwise.