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

fixed bot thinks he is stuck, while in combat

Browse source 
add one more check to waypoint occupy test
This commit is contained in:
jeefo 2015-06-26 23:41:17 +03:00
commit 2f03f579b3
2 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/combat.cpp
View file

@ -1104,6 +1104,9 @@ void Bot::CombatFight (void)
pev->button &= ~IN_JUMP; pev->button &= ~IN_JUMP;
} }
} }
m_isStuck = false;
m_lastCollTime = GetWorldTime () + 0.5f;
} }
bool Bot::HasPrimaryWeapon (void) bool Bot::HasPrimaryWeapon (void)

16
source/navigate.cpp
View file

@ -2140,16 +2140,6 @@ int Bot::FindDefendWaypoint (const Vector &origin)
} }
} while (isOrderChanged); } while (isOrderChanged);
if (waypointIndex[0] == -1)
{
Array <int> found;
g_waypoint->FindInRadius (found, 1024.0f, origin);
if (found.IsEmpty ())
return Random.Long (0, g_numWaypoints - 1); // most worst case, since there a evil error in waypoints
return found.GetRandomElement ();
}
int index = 0; int index = 0;
for (; index < MAX_PATH_INDEX; index++) for (; index < MAX_PATH_INDEX; index++)
@ -3320,9 +3310,11 @@ bool Bot::IsPointOccupied (int index)
continue; continue;
// check if this waypoint is already used // check if this waypoint is already used
if (IsAlive (bot->GetEntity ())) if (!bot->m_notKilled)
{ {
if ((GetShootingConeDeviation (bot->GetEntity (), &pev->origin) >= 0.7f ? bot->m_prevWptIndex[0] : m_currentWaypointIndex) == index || bot->GetTask ()->data == index) int occupyId = GetShootingConeDeviation (bot->GetEntity (), &pev->origin) >= 0.7f ? bot->m_prevWptIndex[0] : m_currentWaypointIndex;
if (occupyId == index || bot->GetTask ()->data == index || (g_waypoint->GetPath (occupyId)->origin - g_waypoint->GetPath (index)->origin).GetLengthSquared () < 8100)
return true; return true;
} }
} }