fixed stack corruption in sound code
This commit is contained in:
parent
9e820b0a34
commit
a27d39a394
13 changed files with 155 additions and 143 deletions
|
|
@ -291,7 +291,7 @@ void Bot::AvoidGrenades (void)
|
|||
m_avoidGrenade = NULL;
|
||||
m_needAvoidGrenade = 0;
|
||||
}
|
||||
Array <entity_t> activeGrenades = bots.GetActiveGrenades ();
|
||||
Array <edict_t *> activeGrenades = bots.GetActiveGrenades ();
|
||||
|
||||
// find all grenades on the map
|
||||
FOR_EACH_AE (activeGrenades, it)
|
||||
|
|
@ -354,7 +354,7 @@ bool Bot::IsBehindSmokeClouds (edict_t *ent)
|
|||
return false;
|
||||
|
||||
const Vector &betweenUs = (ent->v.origin - pev->origin).Normalize ();
|
||||
Array <entity_t> activeGrenades = bots.GetActiveGrenades ();
|
||||
Array <edict_t *> activeGrenades = bots.GetActiveGrenades ();
|
||||
|
||||
// find all grenades on the map
|
||||
FOR_EACH_AE (activeGrenades, it)
|
||||
|
|
@ -2861,7 +2861,7 @@ void Bot::ChooseAimDirection (void)
|
|||
if (m_trackingEdict == m_lastEnemy)
|
||||
{
|
||||
if (m_timeNextTracking < engine.Time ())
|
||||
changePredictedEnemy = IsAlive (m_lastEnemy);
|
||||
changePredictedEnemy = false;
|
||||
}
|
||||
|
||||
if (changePredictedEnemy)
|
||||
|
|
@ -2869,7 +2869,7 @@ void Bot::ChooseAimDirection (void)
|
|||
m_lookAt = waypoints.GetPath (GetAimingWaypoint (m_lastEnemyOrigin))->origin;
|
||||
m_camp = m_lookAt;
|
||||
|
||||
m_timeNextTracking = engine.Time () + 2.0f;
|
||||
m_timeNextTracking = engine.Time () + 1.25f;
|
||||
m_trackingEdict = m_lastEnemy;
|
||||
}
|
||||
else
|
||||
|
|
@ -3005,7 +3005,7 @@ void Bot::ThinkFrame (void)
|
|||
CheckMessageQueue (); // check for pending messages
|
||||
|
||||
// remove voice icon
|
||||
if (g_lastRadioTime[g_clients[engine.IndexOfEntity (GetEntity ()) - 1].realTeam] + Random.Float (0.8f, 2.1f) < engine.Time ())
|
||||
if (g_lastRadioTime[g_clients[engine.IndexOfEntity (GetEntity ()) - 1].team2] + Random.Float (0.8f, 2.1f) < engine.Time ())
|
||||
SwitchChatterIcon (false); // hide icon
|
||||
|
||||
if (botMovement)
|
||||
|
|
@ -6048,6 +6048,9 @@ bool Bot::IsBombDefusing (const Vector &bombOrigin)
|
|||
{
|
||||
// this function finds if somebody currently defusing the bomb.
|
||||
|
||||
if (!g_bombPlanted)
|
||||
return false;
|
||||
|
||||
bool defusingInProgress = false;
|
||||
|
||||
for (int i = 0; i < engine.MaxClients (); i++)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue