From 7ac8b496f1ae92ad55c42352444f4a101a00dcdb Mon Sep 17 00:00:00 2001
From: Major Cooke <majorcooke22@gmail.com>
Date: Sat, 24 Feb 2018 14:36:17 -0600
Subject: [PATCH] Added Distance(2/3)DSquared functions.

---
 src/actor.h                     |  6 ++++++
 src/p_mobj.cpp                  | 14 ++++++++++++++
 wadsrc/static/zscript/actor.txt |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/src/actor.h b/src/actor.h
index 1510a5787c..863e4fb46a 100644
--- a/src/actor.h
+++ b/src/actor.h
@@ -886,6 +886,12 @@ public:
 
 
 	// a full 3D version of the above
+	double Distance3DSquared(AActor *other, bool absolute = false)
+	{
+		DVector3 otherpos = absolute ? other->Pos() : other->PosRelative(this);
+		return (Pos() - otherpos).LengthSquared();
+	}
+
 	double Distance3D(AActor *other, bool absolute = false)
 	{
 		DVector3 otherpos = absolute ? other->Pos() : other->PosRelative(this);
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 8e5e1d3a26..371e3f9773 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -8127,6 +8127,20 @@ DEFINE_ACTION_FUNCTION(AActor, absangle)	// should this be global?
 	ACTION_RETURN_FLOAT(absangle(DAngle(a1), DAngle(a2)).Degrees);
 }
 
+DEFINE_ACTION_FUNCTION(AActor, Distance2DSquared)
+{
+	PARAM_SELF_PROLOGUE(AActor);
+	PARAM_OBJECT_NOT_NULL(other, AActor);
+	ACTION_RETURN_FLOAT(self->Distance2DSquared(other));
+}
+
+DEFINE_ACTION_FUNCTION(AActor, Distance3DSquared)
+{
+	PARAM_SELF_PROLOGUE(AActor);
+	PARAM_OBJECT_NOT_NULL(other, AActor);
+	ACTION_RETURN_FLOAT(self->Distance3DSquared(other));
+}
+
 DEFINE_ACTION_FUNCTION(AActor, Distance2D)
 {
 	PARAM_SELF_PROLOGUE(AActor);
diff --git a/wadsrc/static/zscript/actor.txt b/wadsrc/static/zscript/actor.txt
index fa06447552..cb2ceb9458 100644
--- a/wadsrc/static/zscript/actor.txt
+++ b/wadsrc/static/zscript/actor.txt
@@ -580,6 +580,8 @@ class Actor : Thinker native
 	native void SetDamage(int dmg);
 	native clearscope double Distance2D(Actor other) const;
 	native clearscope double Distance3D(Actor other) const;
+	native clearscope double Distance2DSquared(Actor other) const;
+	native clearscope double Distance3DSquared(Actor other) const;
 	native void SetOrigin(vector3 newpos, bool moving);
 	native void SetXYZ(vector3 newpos);
 	native Actor GetPointer(int aaptr);