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

nav: ensure nearest search node visible from both sides

Browse source
This commit is contained in:
jeefo 2022-11-11 21:36:05 +03:00
commit bbeb78137e
No known key found for this signature in database
GPG key ID: D85B0637366787C3
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/navigate.cpp
View file

@ -1794,7 +1794,7 @@ int Bot::findNearestNode () {
if (distance < minimum) { if (distance < minimum) {
// if bot doing navigation, make sure node really visible and not too high // if bot doing navigation, make sure node really visible and not too high
if ((m_currentNodeIndex != kInvalidNodeIndex && graph.isVisible (m_currentNodeIndex, at)) || isReachableNode (at)) { if ((m_currentNodeIndex != kInvalidNodeIndex && graph.isVisible (m_currentNodeIndex, at) && graph.isVisible (at, m_currentNodeIndex)) || isReachableNode (at)) {
index = at; index = at;
minimum = distance; minimum = distance;
} }
@ -3138,10 +3138,10 @@ bool Bot::isReachableNode (int index) {
float ladderDist = dst.distance2d (src); float ladderDist = dst.distance2d (src);
TraceResult tr {}; TraceResult tr {};
game.testLine (src, dst, TraceIgnore::Monsters, ent (), &tr); game.testHull (src, dst, TraceIgnore::Monsters, head_hull, ent (), &tr);
// if node is visible from current position (even behind head)... // if node is visible from current position (even behind head)...
if (tr.flFraction >= 1.0f) { if (tr.flFraction >= 1.0f && !tr.fStartSolid) {
// it's should be not a problem to reach node inside water... // it's should be not a problem to reach node inside water...
if (pev->waterlevel == 2 || pev->waterlevel == 3) { if (pev->waterlevel == 2 || pev->waterlevel == 3) {