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

Inventory damage needs multiplying first

This commit is contained in:
Edward Richardson 2014-11-20 22:12:16 +13:00
parent 99b2cfa147
commit e303833e5f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_interaction.cpp
View File

@ -1069,11 +1069,11 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
{ {
int olddam = damage; int olddam = damage;
damage = FixedMul(damage, source->DamageMultiply);
if (source->Inventory != NULL) if (source->Inventory != NULL)
{ {
source->Inventory->ModifyDamage(olddam, mod, damage, false); source->Inventory->ModifyDamage(olddam, mod, damage, false);
} }
damage = FixedMul(damage, source->DamageMultiply);
if (olddam != damage && damage <= 0) if (olddam != damage && damage <= 0)
{ // Still allow FORCEPAIN { // Still allow FORCEPAIN