zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Cleaned up leftovers.

Browse source
This commit is contained in:
MajorCooke 2016-01-21 21:23:43 -06:00
parent b51bbf66b0
commit 823edc4a69
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/thingdef/thingdef_codeptr.cpp
View file

@ -6024,9 +6024,6 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckProximity)
//[MC]Make sure it's in range and respect the desire for Z or not. The function forces it to use //[MC]Make sure it's in range and respect the desire for Z or not. The function forces it to use
//Z later for ensuring CLOSEST and FARTHEST flags are respected perfectly. //Z later for ensuring CLOSEST and FARTHEST flags are respected perfectly.
//Ripped from sphere checking in A_RadiusGive (along with a number of things). //Ripped from sphere checking in A_RadiusGive (along with a number of things).
fixedvec3 diff = ref->Vec3To(mo);
diff.z += (ref->height - mo->height) / 2;
if ((flags & CPXF_NODISTANCE) || (ref->AproxDistance(mo) < distance && if ((flags & CPXF_NODISTANCE) || (ref->AproxDistance(mo) < distance &&
((flags & CPXF_NOZ) || ((flags & CPXF_NOZ) ||
((ref->Z() > mo->Z() && ref->Z() - mo->Top() < distance) || ((ref->Z() > mo->Z() && ref->Z() - mo->Top() < distance) ||