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

- fixed incomplete null checks in A_RadiusThrust.

This commit is contained in:
Christoph Oelckers 2018-12-02 16:06:04 +01:00
parent 719598aae4
commit 1f33ba2c4d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wadsrc/static/zscript/actor_attacks.txt
View File

@ -616,17 +616,20 @@ extend class Actor
{
if (force == 0) force = 128;
if (distance <= 0) distance = abs(force);
bool nothrust = false;
bool nothrust = target.bNoDamageThrust;
// Temporarily negate MF2_NODMGTHRUST on the shooter, since it renders this function useless.
if (!(flags & RTF_NOTMISSILE) && target != NULL)
if (target)
{
target.bNoDamageThrust = false;
nothrust = target.bNoDamageThrust;
// Temporarily negate MF2_NODMGTHRUST on the shooter, since it renders this function useless.
if (!(flags & RTF_NOTMISSILE))
{
target.bNoDamageThrust = false;
}
}
RadiusAttack (target, force, distance, DamageType, flags | RADF_NODAMAGE, fullthrustdistance);
CheckSplash(distance);
target.bNoDamageThrust = nothrust;
if (target) target.bNoDamageThrust = nothrust;
}
//==========================================================================