nav: fix double jumping when bot gets stuck
bot: restore bot difficulty levels (ref #729) bot: probably fix freezetime accident shooting (ref #729) build: use noexecstack when building library refactor: rework some old code and remove unnecessary things
This commit is contained in:
parent
70a11d6427
commit
95f907434b
26 changed files with 157 additions and 194 deletions
|
|
@ -576,7 +576,7 @@ IntArray BotGraph::getNearestInRadius (const float radius, const Vector &origin,
|
|||
|
||||
if (bucket.length () < kMaxNodeLinks || radius > cr::sqrf (256.0f)) {
|
||||
for (const auto &path : m_paths) {
|
||||
if (maxCount != -1 && static_cast <int> (result.length ()) > maxCount) {
|
||||
if (maxCount != -1 && result.length <int32_t> () > maxCount) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -588,7 +588,7 @@ IntArray BotGraph::getNearestInRadius (const float radius, const Vector &origin,
|
|||
}
|
||||
|
||||
for (const auto &at : bucket) {
|
||||
if (maxCount != -1 && static_cast <int> (result.length ()) > maxCount) {
|
||||
if (maxCount != -1 && result.length <int32_t> () > maxCount) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1292,6 +1292,7 @@ void BotGraph::showFileInfo () {
|
|||
msg (" uncompressed_size: %dkB", info.uncompressed / 1024);
|
||||
msg (" options: %d", info.options); // display as string ?
|
||||
msg (" analyzed: %s", isAnalyzed () ? conf.translate ("yes") : conf.translate ("no")); // display as string ?
|
||||
msg (" pathfinder: %s", planner.isPathsCheckFailed () ? "floyd" : "astar");
|
||||
|
||||
msg ("");
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue