nav: tweaked reachability timers

nav: ignore pickup item if stuck
fix: bad loading for graphs since last commit
This commit is contained in:
jeefo 2023-04-13 14:07:56 +03:00
commit 5b7e58d360
No known key found for this signature in database
GPG key ID: 927BCA0779BEA8ED
6 changed files with 33 additions and 32 deletions

View file

@ -689,6 +689,9 @@ void Bot::updatePickups () {
}
void Bot::ensureEntitiesClear () {
if ((!m_isStuck || m_navTimeset + getEstimatedNodeReachTime () + m_frameInterval * 2.0f > game.time ()) && !(m_states & Sense::SeeingEnemy)) {
return;
}
const auto currentTask = getCurrentTaskId ();
if (currentTask == Task::PickupItem || (m_states & Sense::PickupItem)) {
@ -4795,10 +4798,8 @@ void Bot::logic () {
m_strafeSpeed = pev->maxspeed * static_cast <float> (m_needAvoidGrenade);
}
// ensure we're not stuck destroying/picking something
if (m_navTimeset + getEstimatedNodeReachTime () + 2.0f < game.time () && !(m_states & Sense::SeeingEnemy)) {
ensureEntitiesClear ();
}
ensureEntitiesClear ();
translateInput ();
// check if need to use parachute