From 2c66f2ce27fa097992fbc1e224eb7cfd2da4af69 Mon Sep 17 00:00:00 2001
From: katsy <katmint@live.com>
Date: Mon, 3 Jul 2023 16:27:07 -0500
Subject: [PATCH] Fix homing attack and ring attraction math dumbs
---
src/p_enemy.c | 2 +-
src/p_user.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/p_enemy.c b/src/p_enemy.c
index fe062cffc6..df2b27af28 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -828,7 +828,7 @@ static boolean P_LookForShield(mobj_t *actor)
continue;
if ((player->powers[pw_shield] & SH_PROTECTELECTRIC)
- && (P_AproxDistance(P_AproxDistance(actor->x-player->mo->x, actor->y-player->mo->y), actor->z-player->mo->z) < FixedMul(RING_DIST, player->mo->scale)))
+ && (R_PointToDist2(0, 0, R_PointToDist2(0, 0, actor->x-player->mo->x, actor->y-player->mo->y), actor->z-player->mo->z) < FixedMul(RING_DIST, player->mo->scale)))
{
P_SetTarget(&actor->tracer, player->mo);
diff --git a/src/p_user.c b/src/p_user.c
index 38af2843b7..8bb5fb2e44 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -9217,7 +9217,7 @@ mobj_t *P_LookForEnemies(player_t *player, boolean nonenemies, boolean bullet)
{
fixed_t zdist = (player->mo->z + player->mo->height/2) - (mo->z + mo->height/2);
- dist = P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y);
+ dist = R_PointToDist2(0, 0, player->mo->x-mo->x, player->mo->y-mo->y);
if (bullet)
{
if ((R_PointToAngle2(0, 0, dist, zdist) + span) > span*2)
@@ -9234,7 +9234,7 @@ mobj_t *P_LookForEnemies(player_t *player, boolean nonenemies, boolean bullet)
continue;
}
- dist = P_AproxDistance(dist, zdist);
+ dist = R_PointToDist2(0, 0, dist, zdist);
if (dist > maxdist)
continue; // out of range
}
--
GitLab