From bbfad3a5445b197eda52b635d04fc65422aa71cc Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Fri, 26 Feb 2021 19:04:24 -0500 Subject: [PATCH] Adjust wall detection Wall detection range was doubled, how much the prediction is adjusted was halved. This is a much nicer middle-ground compared to what it was doing before. --- src/k_bot.c | 2 +- src/k_botsearch.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/k_bot.c b/src/k_bot.c index ec981ef44..510c71cc4 100644 --- a/src/k_bot.c +++ b/src/k_bot.c @@ -573,7 +573,7 @@ static botprediction_t *K_CreateBotPrediction(player_t *player) const tic_t futuresight = (TICRATE * normal) / max(1, handling); // How far ahead into the future to try and predict const fixed_t speed = max(P_AproxDistance(player->mo->momx, player->mo->momy), K_GetKartSpeed(player, false) / 4); - const INT32 startDist = (DEFAULT_WAYPOINT_RADIUS * mapobjectscale) / FRACUNIT; + const INT32 startDist = (768 * mapobjectscale) / FRACUNIT; const INT32 distance = ((FixedMul(speed, distreduce) / FRACUNIT) * futuresight) + startDist; botprediction_t *predict = Z_Calloc(sizeof(botprediction_t), PU_LEVEL, NULL); diff --git a/src/k_botsearch.c b/src/k_botsearch.c index dbf80f586..92deb70ce 100644 --- a/src/k_botsearch.c +++ b/src/k_botsearch.c @@ -387,7 +387,7 @@ fixed_t K_BotReducePrediction(player_t *player) INT32 xl, xh, yl, yh, bx, by; globalsmuggle.botmo = player->mo; - globalsmuggle.distancetocheck = (player->mo->radius * 16); + globalsmuggle.distancetocheck = (player->mo->radius * 32); globalsmuggle.closestlinedist = INT32_MAX; tmx = player->mo->x; @@ -419,7 +419,7 @@ fixed_t K_BotReducePrediction(player_t *player) return FRACUNIT; } - return FixedDiv(globalsmuggle.closestlinedist, globalsmuggle.distancetocheck); + return (FRACUNIT/2) + (FixedDiv(globalsmuggle.closestlinedist, globalsmuggle.distancetocheck) / 2); } /*--------------------------------------------------