OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Added APROP_DamageMultiply

Browse source 
- Used with Set/GetActorProperty, adds a generic multiplier for damage a
source deals.
This commit is contained in:
Edward Richardson 2014-11-20 18:57:40 +13:00
commit 99b2cfa147
5 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/p_interaction.cpp
View file

@ -1065,10 +1065,16 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
}
}
// Handle active damage modifiers (e.g. PowerDamage)
if (source != NULL && source->Inventory != NULL)
if (source != NULL)
{
int olddam = damage;
source->Inventory->ModifyDamage(olddam, mod, damage, false);
damage = FixedMul(damage, source->DamageMultiply);
if (source->Inventory != NULL)
{
source->Inventory->ModifyDamage(olddam, mod, damage, false);
}
if (olddam != damage && damage <= 0)
{ // Still allow FORCEPAIN
if (MustForcePain(target, inflictor))