nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix small issues

Browse Source
This commit is contained in:
TotallyNotElite 2018-08-20 15:18:55 +02:00
parent 074b75079f
commit 9cb761abbe
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/navparser.cpp
View File

@ -211,7 +211,7 @@ int findClosestNavSquare(Vector vec)
// Make sure we're not stuck on the same area for too long // Make sure we're not stuck on the same area for too long
if (std::count(findClosestNavSquare_localAreas.begin(), if (std::count(findClosestNavSquare_localAreas.begin(),
findClosestNavSquare_localAreas.end(), i) < 3) findClosestNavSquare_localAreas.end(), i) < 3)
overlapping.push_back({ i, &areas.at(i) }); overlapping.emplace_back( i, &areas.at(i) );
} }
} }
@ -267,7 +267,7 @@ std::vector<Vector> findPath(Vector loc, Vector dest, int &id_loc, int &id_dest)
int result = TF2MAP->pather->Solve(static_cast<void *>(&areas.at(id_loc)), int result = TF2MAP->pather->Solve(static_cast<void *>(&areas.at(id_loc)),
static_cast<void *>(&areas.at(id_dest)), static_cast<void *>(&areas.at(id_dest)),
&pathNodes, &cost); &pathNodes, &cost);
logging::Info(format(result).c_str()); logging::Info(format("Pathing: Pather result: ", result).c_str());
// If no result found, return empty Vector // If no result found, return empty Vector
if (result == micropather::MicroPather::NO_SOLUTION) if (result == micropather::MicroPather::NO_SOLUTION)
return std::vector<Vector>(0); return std::vector<Vector>(0);
@ -321,7 +321,8 @@ bool NavTo(Vector dest, bool navToLocalCenter, bool persistent,
} }
crumbs.clear(); crumbs.clear();
crumbs = std::move(path); crumbs = std::move(path);
if (!navToLocalCenter) lastArea = crumbs.at(0);
if (!navToLocalCenter && crumbs.size() > 1)
crumbs.erase(crumbs.begin()); crumbs.erase(crumbs.begin());
ensureArrival = persistent; ensureArrival = persistent;
findClosestNavSquare_localAreas.clear(); findClosestNavSquare_localAreas.clear();
@ -489,4 +490,15 @@ CatCommand navpath("nav_path", "Debug nav path", [](const CCommand &args) {
} }
}); });
CatCommand navpathnolocal("nav_path_nolocal", "Debug nav path", [](const CCommand &args) {
if (NavTo(loc, false, true, 50 + priority))
{
logging::Info("Pathing: Success! Walking to path...");
}
else
{
logging::Info("Pathing: Failed!");
}
});
} // namespace nav } // namespace nav