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

some combat behaviour improvements

Browse source
This commit is contained in:
Dmitry 2015-06-08 22:55:57 +03:00
commit f0dcda5747
3 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

11
source/basecode.cpp
View file

@ -2872,16 +2872,11 @@ void Bot::SelectLeaderEachTeam (int team)
void Bot::ChooseAimDirection (void)
{
if (!m_canChooseAimDirection)
return;
TraceResult tr;
memset (&tr, 0, sizeof (TraceResult));
unsigned int flags = m_aimFlags;
bool canChooseAimDirection = false;
if (!(m_currentWaypointIndex >= 0 && m_currentWaypointIndex < g_numWaypoints))
GetValidWaypoint ();
@ -2913,7 +2908,7 @@ void Bot::ChooseAimDirection (void)
if (IsOnLadder () || IsInWater () || (m_waypointFlags & FLAG_LADDER) || (m_currentTravelFlags & PATHFLAG_JUMP))
{
flags &= ~(AIM_LAST_ENEMY | AIM_PREDICT_PATH);
canChooseAimDirection = false;
m_canChooseAimDirection = false;
}
}
@ -2982,7 +2977,7 @@ void Bot::ChooseAimDirection (void)
{
m_lookAt = m_destOrigin;
if (canChooseAimDirection && m_currentWaypointIndex != -1 && !(m_currentPath->flags & FLAG_LADDER))
if (m_canChooseAimDirection && m_currentWaypointIndex != -1 && !(m_currentPath->flags & FLAG_LADDER))
{
int index = m_currentWaypointIndex;
@ -3010,7 +3005,7 @@ void Bot::ChooseAimDirection (void)
}
}
if (canChooseAimDirection && m_prevWptIndex[0] >= 0 && m_prevWptIndex[0] < g_numWaypoints)
if (m_canChooseAimDirection && m_prevWptIndex[0] >= 0 && m_prevWptIndex[0] < g_numWaypoints)
{
Path *path = g_waypoint->GetPath (m_prevWptIndex[0]);