From 13e94dfee06998460f2f041dc3c68d84190cc135 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 25 Sep 2022 12:14:21 -0400 Subject: [PATCH] Polish up Jawz target conditions slightly --- src/k_kart.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index b644350ff..d8a908db3 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -7151,6 +7151,8 @@ player_t *K_FindJawzTarget(mobj_t *actor, player_t *source, angle_t range) continue; } + thisdist = P_AproxDistance(player->mo->x - (actor->x + actor->momx), player->mo->y - (actor->y + actor->momy)); + if (gametyperules & GTR_CIRCUIT) { if (player->position > source->position) @@ -7168,7 +7170,13 @@ player_t *K_FindJawzTarget(mobj_t *actor, player_t *source, angle_t range) } // Z pos too high/low - if (abs(player->mo->z - (actor->z + actor->momz)) > RING_DIST/8) + if (abs(player->mo->z - (actor->z + actor->momz)) > FixedMul(RING_DIST/8, mapobjectscale)) + { + continue; + } + + // Distance too far away + if (thisdist > FixedMul(RING_DIST*2, mapobjectscale)) { continue; } @@ -7183,14 +7191,6 @@ player_t *K_FindJawzTarget(mobj_t *actor, player_t *source, angle_t range) continue; } - thisdist = P_AproxDistance(player->mo->x - (actor->x + actor->momx), player->mo->y - (actor->y + actor->momy)); - - // Don't go for people who are too far away - if (thisdist > 2*RING_DIST) - { - continue; - } - thisScore = (AngleFixed(thisang) * 2) + (thisdist / 2); //CONS_Printf("got score %f from player # %d\n", FixedToFloat(thisScore), i);