mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-22 20:21:26 +00:00
- fixed crash with DMSS_INFLICTORDMGTYPE flag and no inflictor
https://forum.zdoom.org/viewtopic.php?t=66110
This commit is contained in:
parent
f866ade4f1
commit
30f2ac1e89
1 changed files with 1 additions and 1 deletions
|
@ -3810,7 +3810,7 @@ static void DoDamage(AActor *dmgtarget, AActor *inflictor, AActor *source, int a
|
||||||
|
|
||||||
if (amount > 0)
|
if (amount > 0)
|
||||||
{ //Should wind up passing them through just fine.
|
{ //Should wind up passing them through just fine.
|
||||||
if (flags & DMSS_INFLICTORDMGTYPE)
|
if (inflictor && (flags & DMSS_INFLICTORDMGTYPE))
|
||||||
DamageType = inflictor->DamageType;
|
DamageType = inflictor->DamageType;
|
||||||
|
|
||||||
P_DamageMobj(dmgtarget, inflictor, source, amount, DamageType, dmgFlags);
|
P_DamageMobj(dmgtarget, inflictor, source, amount, DamageType, dmgFlags);
|
||||||
|
|
Loading…
Reference in a new issue