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

- Fixed: checkz wasn't used. 

- Use 0 instead of false.
This commit is contained in:
MajorCooke 2016-02-10 18:04:59 -06:00
parent fefdb266cd
commit dcfdb50307
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/thingdef/thingdef_codeptr.cpp
View File

@ -271,13 +271,15 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, GetDistance)
if (!target || target == self)
{
ret->SetFloat(false);
ret->SetFloat(0);
}
else
{
fixedvec3 diff = self->Vec3To(target);
diff.z += (target->height - self->height) / 2;
const double length = TVector3<double>(FIXED2DBL(diff.x), FIXED2DBL(diff.y), FIXED2DBL(diff.z)).Length();
if (checkz)
diff.z += (target->height - self->height) / 2;
const double length = TVector3<double>(FIXED2DBL(diff.x), FIXED2DBL(diff.y), (checkz) ? FIXED2DBL(diff.z) : 0).Length();
ret->SetFloat(length);
}
return 1;