thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify forced bot direction behavior

Browse source 
Resolves #741
This commit is contained in:
Sally Coolatta 2023-12-19 09:14:04 -05:00
parent 54e62bbd8f
commit 1911a45e3f
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/k_bot.cpp
View file

@ -1606,6 +1606,7 @@ static void K_BuildBotTiccmdNormal(player_t *player, ticcmd_t *cmd)
destangle = player->mo->angle; destangle = player->mo->angle;
boolean forcedDir = false;
if (botController != nullptr && (botController->flags & TMBOT_FORCEDIR) == TMBOT_FORCEDIR) if (botController != nullptr && (botController->flags & TMBOT_FORCEDIR) == TMBOT_FORCEDIR)
{ {
const fixed_t dist = DEFAULT_WAYPOINT_RADIUS * player->mo->scale; const fixed_t dist = DEFAULT_WAYPOINT_RADIUS * player->mo->scale;
@ -1616,6 +1617,8 @@ static void K_BuildBotTiccmdNormal(player_t *player, ticcmd_t *cmd)
predict->x = player->mo->x + FixedMul(dist, FINECOSINE(botController->forceAngle >> ANGLETOFINESHIFT)); predict->x = player->mo->x + FixedMul(dist, FINECOSINE(botController->forceAngle >> ANGLETOFINESHIFT));
predict->y = player->mo->y + FixedMul(dist, FINESINE(botController->forceAngle >> ANGLETOFINESHIFT)); predict->y = player->mo->y + FixedMul(dist, FINESINE(botController->forceAngle >> ANGLETOFINESHIFT));
predict->radius = (DEFAULT_WAYPOINT_RADIUS / 4) * mapobjectscale; predict->radius = (DEFAULT_WAYPOINT_RADIUS / 4) * mapobjectscale;
forcedDir = true;
} }
if (P_IsObjectOnGround(player->mo) == false) if (P_IsObjectOnGround(player->mo) == false)
@ -1633,7 +1636,12 @@ static void K_BuildBotTiccmdNormal(player_t *player, ticcmd_t *cmd)
//return; // Don't allow bots to turn in the air. //return; // Don't allow bots to turn in the air.
} }
if (leveltime <= starttime && finishBeamLine != nullptr) if (forcedDir == true)
{
destangle = R_PointToAngle2(player->mo->x, player->mo->y, predict->x, predict->y);
turnamt = K_HandleBotTrack(player, cmd, predict, destangle);
}
else if (leveltime <= starttime && finishBeamLine != nullptr)
{ {
// Handle POSITION!! // Handle POSITION!!
const fixed_t distBase = 480*mapobjectscale; const fixed_t distBase = 480*mapobjectscale;