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

minor changes

Browse source
This commit is contained in:
jeefo 2015-08-01 00:18:50 +03:00
commit ae87f0985a
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
source/basecode.cpp
View file

@ -5293,7 +5293,7 @@ void Bot::TakeBlinded (const Vector &fade, int alpha)
// it's used to make bot blind froumd the grenade. // it's used to make bot blind froumd the grenade.
if (fade.x != 255 || fade.y != 255 || fade.z != 255 || alpha <= 200) if (fade.x != 255 || fade.y != 255 || fade.z != 255 || alpha <= 170)
return; return;
m_enemy = NULL; m_enemy = NULL;
@ -5810,17 +5810,21 @@ float Bot::GetEstimatedReachTime (void)
else else
estimatedTime = 4.0f * distance / pev->maxspeed; estimatedTime = 4.0f * distance / pev->maxspeed;
bool longTermReachability = (m_currentPath->flags & FLAG_CROUCH) || (m_currentPath->flags & FLAG_LADDER) || (pev->button & IN_DUCK);
// check for special waypoints, that can slowdown our movement // check for special waypoints, that can slowdown our movement
if ((m_currentPath->flags & FLAG_CROUCH) || (m_currentPath->flags & FLAG_LADDER) || (pev->button & IN_DUCK)) if (longTermReachability)
estimatedTime *= 3.0f; estimatedTime *= 3.0f;
// check for too low values // check for too low values
if (estimatedTime < 1.0f) if (estimatedTime < 1.0f)
estimatedTime = 1.0f; estimatedTime = 1.0f;
const float maxReachTime = longTermReachability ? 10.0f : 5.0f;
// check for too high values // check for too high values
if (estimatedTime > 8.0f) if (estimatedTime > maxReachTime)
estimatedTime = 8.0f; estimatedTime = maxReachTime;
} }
return estimatedTime; return estimatedTime;
} }

9
source/navigate.cpp
View file

@ -243,14 +243,13 @@ void Bot::FilterGoals (const Array <int> &goals, int *result)
{ {
// this function filters the goals, so new goal is not bot's old goal, and array of goals doesn't contains duplicate goals // this function filters the goals, so new goal is not bot's old goal, and array of goals doesn't contains duplicate goals
int totalGoals = goals.GetElementNumber ();
int searchCount = 0; int searchCount = 0;
for (int index = 0; index < 4; index++) for (int index = 0; index < 4; index++)
{ {
int rand = goals.GetRandomElement (); int rand = goals.GetRandomElement ();
if (searchCount <= 8 && (m_prevGoalIndex == rand || ((result[0] == rand || result[1] == rand || result[2] == rand || result[3] == rand) && totalGoals > 4)) && !IsPointOccupied (rand)) if (searchCount <= 8 && (m_prevGoalIndex == rand || ((result[0] == rand || result[1] == rand || result[2] == rand || result[3] == rand) && goals.GetElementNumber () > 4)) && !IsPointOccupied (rand))
{ {
if (index > 0) if (index > 0)
index--; index--;
@ -1841,7 +1840,7 @@ bool Bot::FindWaypoint (void)
#if 0 #if 0
if (i == m_currentWaypointIndex || i == m_prevWptIndex[0] || i == m_prevWptIndex[1] || i == m_prevWptIndex[2] || i == m_prevWptIndex[3] || i == m_prevWptIndex[4]) if (i == m_currentWaypointIndex || i == m_prevWptIndex[0] || i == m_prevWptIndex[1] || i == m_prevWptIndex[2] || i == m_prevWptIndex[3] || i == m_prevWptIndex[4])
#else #else
if (i == m_currentWaypointIndex || i == m_prevWptIndex[0]) if (i == m_currentWaypointIndex || i == m_prevWptIndex[0] || i == m_prevWptIndex[1] || i == m_prevWptIndex[2])
#endif #endif
continue; continue;
@ -3158,6 +3157,10 @@ void Bot::UpdateLookAngles (void)
const float delta = GetWorldTime () - m_lookUpdateTime; const float delta = GetWorldTime () - m_lookUpdateTime;
m_lookUpdateTime = GetWorldTime (); m_lookUpdateTime = GetWorldTime ();
// in intermission, do not try to look at something, but update the timer above
if (g_timeRoundStart < GetWorldTime () || !m_buyingFinished)
return;
// adjust all body and view angles to face an absolute vector // adjust all body and view angles to face an absolute vector
Vector direction = (m_lookAt - EyePosition ()).ToAngles (); Vector direction = (m_lookAt - EyePosition ()).ToAngles ();
direction.x *= -1.0f; // invert for engine direction.x *= -1.0f; // invert for engine