From d6c497065e246fef85aab86f1d32b217caf5f305 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sat, 7 Nov 2020 19:47:50 -0500
Subject: [PATCH] Use FixedHypot over P_AproxDistance
Not convinced that the small speed benefit from P_AproxDistance is worth the "aproximate"[sic] results it gives. Let's instead try a define to replace it with FixedHypot. In Lua, the function gives a deprecated warning.
Inspired by the hyperwall fix for vanilla, except for everything. From little testing, actively improves waypoint checks, bumping, speed checks, wall collisions, Jawz targetting, Lightning Shield attacks, so on.
The only way I see this as a potential downgrade is A_Look (and related functions) getting slower, which are barely used in Kart.
---
src/lua_baselib.c | 3 ++-
src/p_maputl.c | 13 -------------
src/p_maputl.h | 2 +-
3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 56b1a5a54..c50f53dfc 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -238,7 +238,8 @@ static int lib_pAproxDistance(lua_State *L)
fixed_t dx = luaL_checkfixed(L, 1);
fixed_t dy = luaL_checkfixed(L, 2);
//HUDSAFE
- lua_pushfixed(L, P_AproxDistance(dx, dy));
+ LUA_Deprecated(L, "P_AproxDistance", "FixedHypot");
+ lua_pushfixed(L, FixedHypot(dx, dy));
return 1;
}
diff --git a/src/p_maputl.c b/src/p_maputl.c
index 260eb3ec6..760e45c4f 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -23,19 +23,6 @@
#include "p_slopes.h"
#include "z_zone.h"
-//
-// P_AproxDistance
-// Gives an estimation of distance (not exact)
-//
-fixed_t P_AproxDistance(fixed_t dx, fixed_t dy)
-{
- dx = abs(dx);
- dy = abs(dy);
- if (dx < dy)
- return dx + dy - (dx>>1);
- return dx + dy - (dy>>1);
-}
-
//
// P_ClosestPointOnLine
// Finds the closest point on a given line to the supplied point
diff --git a/src/p_maputl.h b/src/p_maputl.h
index be69e0265..ec4a4aa33 100644
--- a/src/p_maputl.h
+++ b/src/p_maputl.h
@@ -41,7 +41,7 @@ typedef boolean (*traverser_t)(intercept_t *in);
boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2,
INT32 pflags, traverser_t ptrav);
-FUNCMATH fixed_t P_AproxDistance(fixed_t dx, fixed_t dy);
+#define P_AproxDistance(dx, dy) FixedHypot(dx, dy)
void P_ClosestPointOnLine(fixed_t x, fixed_t y, line_t *line, vertex_t *result);
void P_ClosestPointOnLine3D(fixed_t x, fixed_t y, fixed_t z, line_t *line, vertex_t *result);
INT32 P_PointOnLineSide(fixed_t x, fixed_t y, line_t *line);
--
GitLab