zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-24 13:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pass the target as the source for active damage modifiers (i.e. PowerDamage) instead of the actual source.

Browse source 
- Getting the victim would be impossible otherwise, and passing in the original source is redundant when there's already the owner.
This commit is contained in:
Major Cooke 2019-02-12 10:00:28 -06:00 committed by Christoph Oelckers
parent 3864ed78e0
commit 32e65ff11d
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

@ -1143,7 +1143,7 @@ static int DamageMobj (AActor *target, AActor *inflictor, AActor *source, int da
// Handle active damage modifiers (e.g. PowerDamage) // Handle active damage modifiers (e.g. PowerDamage)
if (damage > 0 && !(flags & DMG_NO_ENHANCE)) if (damage > 0 && !(flags & DMG_NO_ENHANCE))
{ {
damage = source->GetModifiedDamage(mod, damage, false, inflictor, source, flags); damage = source->GetModifiedDamage(mod, damage, false, inflictor, target, flags);
} }
} }
// Handle passive damage modifiers (e.g. PowerProtection), provided they are not afflicted with protection penetrating powers. // Handle passive damage modifiers (e.g. PowerProtection), provided they are not afflicted with protection penetrating powers.