From e04fe0622613bca435ce922765429b729f6873bc Mon Sep 17 00:00:00 2001
From: MajorCooke <paul.growney22@gmail.com>
Date: Wed, 10 Feb 2016 17:13:50 -0600
Subject: [PATCH] GetDistance Non-Action (Double version) - Added
 GetDistance(bool checkz, ptr = aaptr_target). - Returns the distance of an
 actor. Must be target, master or tracer.

---
 src/thingdef/thingdef_codeptr.cpp | 35 +++++++++++++++++++++++++++++++
 wadsrc/static/actors/actor.txt    |  1 +
 2 files changed, 36 insertions(+)

diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp
index 1e15a5c33b..9a8e02468c 100644
--- a/src/thingdef/thingdef_codeptr.cpp
+++ b/src/thingdef/thingdef_codeptr.cpp
@@ -250,6 +250,41 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, CountInv)
 	return 0;
 }
 
+//==========================================================================
+//
+// GetDistance
+//
+// NON-ACTION function to get the distance in double.
+//
+//==========================================================================
+DEFINE_ACTION_FUNCTION_PARAMS(AActor, GetDistance)
+{
+	if (numret > 0)
+	{
+		assert(ret != NULL);
+		PARAM_PROLOGUE;
+		PARAM_OBJECT(self, AActor);
+		PARAM_BOOL(checkz);
+		PARAM_INT_OPT(ptr) { ptr = AAPTR_TARGET; }
+
+		AActor *target = COPY_AAPTR(self, ptr);
+
+		if (!target || target == self)
+		{
+			ret->SetFloat(false);
+		}
+		else
+		{
+			fixedvec3 diff = self->Vec3To(target);
+			diff.z += (target->height - self->height) / 2;
+			const double lengthsquared = TVector3<double>(diff.x, diff.y, diff.z).LengthSquared();
+			ret->SetFloat(lengthsquared);
+		}
+		return 1;
+	}
+	return 0;
+}
+
 //==========================================================================
 //
 // A_RearrangePointers
diff --git a/wadsrc/static/actors/actor.txt b/wadsrc/static/actors/actor.txt
index 8e30693cfd..48ee9f68fd 100644
--- a/wadsrc/static/actors/actor.txt
+++ b/wadsrc/static/actors/actor.txt
@@ -41,6 +41,7 @@ ACTOR Actor native //: Thinker
 	native bool CheckClass(class<Actor> checkclass, int ptr_select = AAPTR_DEFAULT, bool match_superclass = false);
 	native bool IsPointerEqual(int ptr_select1, int ptr_select2);
 	native int	CountInv(class<Inventory> itemtype, int ptr_select = AAPTR_DEFAULT);
+	native float GetDistance(bool checkz, int ptr = AAPTR_DEFAULT);
 
 	// Action functions
 	// Meh, MBF redundant functions. Only for DeHackEd support.