Merge branch 'bottrack-crash' into 'master'

K_BuildBotTiccmd: Catch NULL track predictions

See merge request KartKrew/Kart!904
This commit is contained in:
toaster 2023-02-06 22:16:52 +00:00
commit 3dcc0c038f

View file

@ -1397,7 +1397,10 @@ void K_BuildBotTiccmd(player_t *player, ticcmd_t *cmd)
} }
} }
if (predict != NULL)
{
turnamt = K_HandleBotTrack(player, cmd, predict, destangle); turnamt = K_HandleBotTrack(player, cmd, predict, destangle);
}
cmd->buttons &= ~(BT_ACCELERATE|BT_BRAKE); cmd->buttons &= ~(BT_ACCELERATE|BT_BRAKE);
cmd->forwardmove = 0; cmd->forwardmove = 0;
trySpindash = true; trySpindash = true;
@ -1431,9 +1434,12 @@ void K_BuildBotTiccmd(player_t *player, ticcmd_t *cmd)
} }
} }
if (predict != NULL)
{
turnamt = K_HandleBotTrack(player, cmd, predict, destangle); turnamt = K_HandleBotTrack(player, cmd, predict, destangle);
} }
} }
}
else else
{ {
// Handle steering towards waypoints! // Handle steering towards waypoints!
@ -1450,8 +1456,11 @@ void K_BuildBotTiccmd(player_t *player, ticcmd_t *cmd)
} }
} }
if (predict != NULL)
{
turnamt = K_HandleBotTrack(player, cmd, predict, destangle); turnamt = K_HandleBotTrack(player, cmd, predict, destangle);
} }
}
if (trySpindash == true) if (trySpindash == true)
{ {