markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: flaws in previous commit

Browse source
This commit is contained in:
jeefo 2023-01-18 22:46:07 +03:00
commit 11c5e045d1
No known key found for this signature in database
GPG key ID: D85B0637366787C3
1 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/navigate.cpp
View file

@ -761,59 +761,55 @@ bool Bot::updateNavigation () {
m_enemy = client.ent; m_enemy = client.ent;
m_lastEnemy = client.ent; m_lastEnemy = client.ent;
m_lastEnemyOrigin = client.ent->v.origin; m_lastEnemyOrigin = client.ent->v.origin;
m_enemyParts = Visibility::None; m_enemyParts = Visibility::None;
m_enemyParts = Visibility::Head; m_enemyParts |= (Visibility::Head | Visibility::Body);
m_enemyParts = Visibility::Body;
m_states |= Sense::SeeingEnemy; m_states |= Sense::SeeingEnemy;
m_seeEnemyTime = game.time (); m_seeEnemyTime = game.time ();
break; break;
} }
} }
else { else {
if (graph.exists (m_previousNodes[0])) { game.testHull (getEyesPos (), m_path->origin, TraceIgnore::Monsters, pev->flags & FL_DUCKING ? head_hull : human_hull, ent (), &tr);
getEyesPos () = graph[m_previousNodes[0]].origin;
}
else {
game.testHull (getEyesPos (), m_path->origin, TraceIgnore::Monsters, pev->flags & FL_DUCKING ? head_hull : human_hull, ent (), &tr);
// someone is above or below us // someone is above or below us and is using the ladder already
// and is using the ladder already if (tr.pHit == client.ent && cr::abs (pev->origin.z - client.ent->v.origin.z) > 15.0f && (client.ent->v.movetype == MOVETYPE_FLY)) {
if (tr.pHit == client.ent && cr::abs (pev->origin.z - client.ent->v.origin.z) > 15.0f && (client.ent->v.movetype == MOVETYPE_FLY)) { if (graph.exists (m_previousNodes[0])) {
if (graph.exists (m_previousNodes[0])) { if (!(graph[m_previousNodes[0]].flags & NodeFlag::Ladder)) {
if (!(graph[m_previousNodes[0]].flags & NodeFlag::Ladder)) { foundGround = true;
previousNode = m_previousNodes[0];
}
else if (graph.exists (m_previousNodes[1])) {
if (!(graph[m_previousNodes[1]].flags & NodeFlag::Ladder)) {
foundGround = true; foundGround = true;
previousNode = m_previousNodes[0]; previousNode = m_previousNodes[1];
} }
else if (graph.exists (m_previousNodes[1])) { else if (graph.exists (m_previousNodes[2])) {
if (!(graph[m_previousNodes[1]].flags & NodeFlag::Ladder)) { if (!(graph[m_previousNodes[2]].flags & NodeFlag::Ladder)) {
foundGround = true; foundGround = true;
previousNode = m_previousNodes[1]; previousNode = m_previousNodes[2];
} }
else if (graph.exists (m_previousNodes[2])) { else if (graph.exists (m_previousNodes[3])) {
if (!(graph[m_previousNodes[2]].flags & NodeFlag::Ladder)) { if (!(graph[m_previousNodes[3]].flags & NodeFlag::Ladder)) {
foundGround = true; foundGround = true;
previousNode = m_previousNodes[2]; previousNode = m_previousNodes[3];
}
else if (graph.exists (m_previousNodes[3])) {
if (!(graph[m_previousNodes[3]].flags & NodeFlag::Ladder)) {
foundGround = true;
previousNode = m_previousNodes[3];
}
} }
} }
} }
} }
if (foundGround) { }
if (getCurrentTaskId () != Task::MoveToPosition || !cr::fequal (getTask ()->desire, TaskPri::PlantBomb)) { if (foundGround) {
m_currentNodeIndex = m_previousNodes[0]; if (getCurrentTaskId () != Task::MoveToPosition || !cr::fequal (getTask ()->desire, TaskPri::PlantBomb)) {
startTask (Task::MoveToPosition, TaskPri::PlantBomb, previousNode, 0.0f, true); m_currentNodeIndex = m_previousNodes[0];
} startTask (Task::MoveToPosition, TaskPri::PlantBomb, previousNode, 0.0f, true);
break;
} }
break;
} }
} }
} }
} }
} }
} }