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

fix: occupied point check radius calculated incorrectly

Browse source 
fix: occupied point calculation takes too much cpu power
fix: buffer overrun in messaging processing
fix: running bots on hlds 3111e (cs 1.5) on linux*
build: added back correct ldscript for gcc and clang

* for some reason only gcc-compiled binaries working on centos5.8 and hlds 3.1.1.1e. clang binaries crashing immediately, so if you want to run bot on ancient os and/or hlds you need to recompile with gcc, as default linux binaries built with clang.
This commit is contained in:
dmitry 2021-09-10 19:42:24 +03:00
commit f55730ac6d
No known key found for this signature in database
GPG key ID: 8297CE728B7A7E37
11 changed files with 162 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/navigate.cpp
View file

@ -2993,49 +2993,52 @@ bool Bot::isOccupiedNode (int index, bool needZeroVelocity) {
continue;
}
// just in case, if something happend, and we're not updated yet
if (!util.isAlive (client.ent)) {
continue;
}
// do not check clients far away from us
if ((pev->origin - client.origin).lengthSq () > cr::square (320.0f)) {
continue;
}
if (needZeroVelocity && client.ent->v.velocity.length2d () > 0.0f) {
continue;
}
auto bot = bots[client.ent];
auto length = (graph[index].origin - client.origin).lengthSq ();
if (bot == this) {
continue;
}
if (bot != nullptr) {
int occupyId = util.getShootingCone (bot->ent (), pev->origin) >= 0.7f ? bot->m_previousNodes[0] : bot->m_currentNodeIndex;
if (index == occupyId) {
return true;
}
}
float length = (graph[index].origin - client.origin).lengthSq ();
if (length < cr::clamp (graph[index].radius, cr::square (90.0f), cr::square (120.0f))) {
if (length < cr::clamp (cr::square (graph[index].radius), cr::square (60.0f), cr::square (90.0f))) {
return true;
}
#if 0 // too cpu hungry, disabled temporary
auto bot = bots[client.ent];
if (bot == nullptr || bot == this || !bot->m_notKilled) {
continue;
}
auto occupyId = util.getShootingCone (bot->ent (), pev->origin) >= 0.7f ? bot->m_previousNodes[0] : bot->m_currentNodeIndex;
if (index == occupyId) {
return true;
}
#endif
}
return false;
}
edict_t *Bot::lookupButton (const char *targetName) {
edict_t *Bot::lookupButton (const char *target) {
// this function tries to find nearest to current bot button, and returns pointer to
// it's entity, also here must be specified the target, that button must open.
if (strings.isEmpty (targetName)) {
if (strings.isEmpty (target)) {
return nullptr;
}
float nearest = kInfiniteDistance;
edict_t *result = nullptr;
// find the nearest button which can open our target
game.searchEntities ("target", targetName, [&] (edict_t *ent) {
game.searchEntities ("target", target, [&] (edict_t *ent) {
const Vector &pos = game.getEntityWorldOrigin (ent);
// check if this place safe