Add files via upload

Author: EfeDursun125

source/basecode.cpp

@@ -63,15 +63,13 @@ void Bot::PushMessageQueue(int message)
 	if (message == CMENU_SAY)
 	{
 		// notify other bots of the spoken text otherwise, bots won't respond to other bots (network messages aren't sent from bots)
-		int entityIndex = GetIndex();
-
 		for (const auto& bot : g_botManager->m_bots)
 		{
 			if (bot != nullptr && bot != this)
 			{
 				if (m_isAlive == bot->m_isAlive)
 				{
-					bot->m_sayTextBuffer.entityIndex = entityIndex;
+					bot->m_sayTextBuffer.entityIndex = m_index;
 					strcpy(bot->m_sayTextBuffer.sayText, m_tempStrings);
 				}
 			}
@@ -1038,7 +1036,7 @@ void Bot::SwitchChatterIcon(bool show)
 
 		MESSAGE_BEGIN(MSG_ONE, g_netMsg->GetId(NETMSG_BOTVOICE), nullptr, client.ent); // begin message
 		WRITE_BYTE(show); // switch on/off
-		WRITE_BYTE(GetIndex());
+		WRITE_BYTE(m_index);
 		MESSAGE_END();
 	}
 }
@@ -1117,7 +1115,7 @@ void Bot::PlayChatterMessage(ChatterMessage message)
 			continue;
 
 		MESSAGE_BEGIN(MSG_ONE, g_netMsg->GetId(NETMSG_SENDAUDIO), nullptr, client.ent); // begin message
-		WRITE_BYTE(GetIndex());
+		WRITE_BYTE(m_index);
 
 		if (!(pev->deadflag & DEAD_DEAD))
 			WRITE_STRING(FormatBuffer("%s/%s.wav", ebot_chatter_path.GetString(), voice));
@@ -1927,7 +1925,7 @@ void Bot::SetConditions(void)
 		// FIXME: it probably should be also team/map dependant
 		if (FNullEnt(m_enemy) && (g_timeRoundMid < engine->GetTime()) && !m_isUsingGrenade && m_personality != PERSONALITY_CAREFUL && m_currentWaypointIndex != g_waypoint->FindNearest(m_lastEnemyOrigin))
 		{
-			desireLevel = 4096.0f - ((1.0f - tempAgression) * Q_rsqrt(distance));
+			desireLevel = 4096.0f - ((1.0f - tempAgression) * Q_sqrt(distance));
 			desireLevel = (100 * desireLevel) / 4096.0f;
 			desireLevel -= retreatLevel;
 
@@ -3738,6 +3736,7 @@ void Bot::Think(void)
 		m_isZombieBot = IsZombieEntity(GetEntity());
 		m_team = GetTeam(GetEntity());
 		m_isAlive = IsAlive(GetEntity());
+		m_index = GetIndex();
 		m_isBomber = pev->weapons & (1 << WEAPON_C4);
 
 		if (m_isZombieBot)
@@ -4771,13 +4770,13 @@ void Bot::RunTask(void)
 						m_myMeshWaypoint = myCampPoint;
 						MeshWaypoints.RemoveAll();
 
-						float max = 10.0f;
+						float max = 12.0f;
 						if (!FNullEnt(m_enemy))
 						{
 							if (m_personality == PERSONALITY_RUSHER)
-								max = 20.0f;
+								max = 16.0f;
 							else if (m_personality != PERSONALITY_CAREFUL)
-								max = 15.0f;
+								max = 8.0f;
 						}
 
 						GetCurrentTask()->time = engine->GetTime() + engine->RandomFloat(4.0f, max);
@@ -5064,7 +5063,7 @@ void Bot::RunTask(void)
 
 			RadioMessage(Radio_SectorClear);
 		}
-		else if (!FNullEnt(m_enemy) && m_numEnemiesLeft > 0)
+		else if (m_numEnemiesLeft > 0 && !FNullEnt(m_enemy))
 		{
 			const int friends = m_numFriendsLeft > 0 ? GetNearbyFriendsNearPosition(pev->origin, 768.0f) : 0;
 			if (friends < 2 && defuseRemainingTime < timeToBlowUp)
@@ -5331,7 +5330,7 @@ void Bot::RunTask(void)
 			m_moveToGoal = false;
 		}
 		else if (!FNullEnt(m_enemy) || m_enemyOrigin != nullvec)
-			destination = m_enemyOrigin + (m_enemy->v.velocity.SkipZ() * 0.5f);
+			destination = m_enemyOrigin + (m_enemy->v.velocity.SkipZ() * 0.54f);
 		else
 			m_enemy = m_lastEnemy;
 
@@ -5440,7 +5439,7 @@ void Bot::RunTask(void)
 			m_moveToGoal = false;
 		}
 		else if (!FNullEnt(m_enemy) || m_enemyOrigin != nullvec)
-			destination = m_enemyOrigin + (m_enemy->v.velocity.SkipZ() * 0.5f);
+			destination = m_enemyOrigin + (m_enemy->v.velocity.SkipZ() * 0.54f);
 		else
 			m_enemy = m_lastEnemy;
 
@@ -5517,9 +5516,9 @@ void Bot::RunTask(void)
 
 		src = m_lastEnemyOrigin - pev->velocity;
 
-		// predict where the enemy is in 0.5 secs
+		// predict where the enemy is in 0.54 secs
 		if (!FNullEnt(m_enemy))
-			src = src + m_enemy->v.velocity * 0.5f;
+			src += m_enemy->v.velocity * 0.54f;
 
 		m_grenade = (src - EyePosition()).Normalize();
 
@@ -5569,7 +5568,7 @@ void Bot::RunTask(void)
 			m_moveToGoal = false;
 		}
 		else if (!FNullEnt(m_enemy) || m_enemyOrigin != nullvec)
-			destination = m_enemyOrigin + (m_enemy->v.velocity.SkipZ() * 0.5f);
+			destination = m_enemyOrigin + (m_enemy->v.velocity.SkipZ() * 0.54f);
 
 		m_isUsingGrenade = true;
 		m_checkTerrain = false;
@@ -6423,7 +6422,7 @@ void Bot::BotAI(void)
 
 		if (!IsOnLadder())
 		{
-			if (!FNullEnt(m_enemy) && m_isEnemyReachable)
+			if (m_isEnemyReachable && !FNullEnt(m_enemy))
 			{
 				m_moveToGoal = false; // don't move to goal
 				m_navTimeset = engine->GetTime();
@@ -7212,8 +7211,8 @@ Vector Bot::CheckToss(const Vector& start, Vector end)
 	if ((midPoint.z < start.z) || (midPoint.z < end.z))
 		return nullvec;
 
-	float timeOne = Q_rsqrt((midPoint.z - start.z) / (0.5f * gravity));
-	float timeTwo = Q_rsqrt((midPoint.z - end.z) / (0.5f * gravity));
+	float timeOne = Q_sqrt((midPoint.z - start.z) / (0.54f * gravity));
+	float timeTwo = Q_sqrt((midPoint.z - end.z) / (0.54f * gravity));
 
 	if (timeOne < 0.1)
 		return nullvec;
@@ -7560,7 +7559,7 @@ void Bot::ReactOnSound(void)
 	if (!FNullEnt(m_enemy))
 		return;
 
-	if (g_clients[GetIndex()].timeSoundLasting <= engine->GetTime())
+	if (g_clients[m_index].timeSoundLasting <= engine->GetTime())
 		return;
 
 	edict_t* player = nullptr;

source/chatlib.cpp

@@ -478,7 +478,7 @@ void Bot::ChatSay(bool teamSay, const char* text, ...)
         m_lastChatEnt = GetEntity();
 
         MESSAGE_BEGIN(MSG_ONE, g_netMsg->GetId(NETMSG_SAYTEXT), nullptr, client.ent);
-        WRITE_BYTE(GetIndex());
+        WRITE_BYTE(m_index);
         WRITE_STRING(tempMessage);
         MESSAGE_END();
     }

source/combat.cpp

@@ -158,7 +158,8 @@ bool Bot::LookupEnemy(void)
 		return false;
 
 	int i;
-	edict_t* entity = nullptr, * targetEntity = nullptr;
+	edict_t* entity = nullptr;
+	edict_t* targetEntity = nullptr;
 	float enemy_distance = FLT_MAX;
 	edict_t* oneTimeCheckEntity = nullptr;
 
@@ -196,11 +197,12 @@ bool Bot::LookupEnemy(void)
 	}
 	else if (!FNullEnt(m_moveTargetEntity))
 	{
-		if (m_team == GetTeam(m_moveTargetEntity) || !IsAlive(m_moveTargetEntity) || GetEntityOrigin(m_moveTargetEntity) == nullvec)
+		auto origin = GetEntityOrigin(m_moveTargetEntity);
+		if (m_team == GetTeam(m_moveTargetEntity) || !IsAlive(m_moveTargetEntity) || origin == nullvec)
 			SetMoveTarget(nullptr);
 
 		targetEntity = m_moveTargetEntity;
-		enemy_distance = (pev->origin - GetEntityOrigin(m_moveTargetEntity)).GetLengthSquared();
+		enemy_distance = (pev->origin - origin).GetLengthSquared();
 	}
 
 	ResetCheckEnemy();
@@ -506,9 +508,8 @@ bool Bot::IsFriendInLineOfFire(float distance)
 	MakeVectors(pev->v_angle);
 
 	TraceResult tr;
-	TraceLine(EyePosition(), EyePosition() + pev->v_angle.Normalize() * distance, false, false, GetEntity(), &tr);
+	TraceLine(EyePosition(), EyePosition() + distance * pev->v_angle.Normalize(), false, false, GetEntity(), &tr);
 
-	int i;
 	if (!FNullEnt(tr.pHit))
 	{
 		if (IsAlive(tr.pHit) && m_team == GetTeam(tr.pHit))
@@ -517,7 +518,7 @@ bool Bot::IsFriendInLineOfFire(float distance)
 				return true;
 
 			int entityIndex = ENTINDEX(tr.pHit);
-			for (i = 0; i < entityNum; i++)
+			for (int i = 0; i < entityNum; i++)
 			{
 				if (g_entityId[i] == -1 || g_entityAction[i] != 1)
 					continue;
@@ -528,6 +529,21 @@ bool Bot::IsFriendInLineOfFire(float distance)
 		}
 	}
 
+	for (const auto& client : g_clients)
+	{
+		if (client.index < 0)
+			continue;
+
+		if (!(client.flags & CFLAG_USED) || !(client.flags & CFLAG_ALIVE) || client.team != m_team || client.ent == GetEntity())
+			continue;
+
+		Vector origin = client.ent->v.origin;
+		float friendDistance = (origin - pev->origin).GetLengthSquared();
+
+		if (friendDistance <= distance && GetShootingConeDeviation(GetEntity(), &origin) > friendDistance / (friendDistance + 1089.0f))
+			return true;
+	}
+
 	return false;
 }
 
@@ -644,15 +660,15 @@ bool Bot::DoFirePause(float distance)//, FireDelay *fireDelay)
 // this function will return true if weapon was fired, false otherwise
 void Bot::FireWeapon(void)
 {
-	float distance = (m_lookAt - EyePosition()).GetLength(); // how far away is the enemy?
-
 	// if using grenade stop this
 	if (m_isUsingGrenade)
 	{
-		m_shootTime = engine->GetTime() + 0.2f;
+		m_shootTime = engine->GetTime() + 0.25f;
 		return;
 	}
 
+	float distance = (m_lookAt - pev->origin).GetLength(); // how far away is the enemy?
+
 	// or if friend in line of fire, stop this too but do not update shoot time
 	if (!FNullEnt(m_enemy) && IsFriendInLineOfFire(distance))
 		return;
@@ -682,6 +698,7 @@ void Bot::FireWeapon(void)
 			if ((m_ammoInClip[selectTab[selectIndex].id] > 0) && !IsWeaponBadInDistance(selectIndex, distance))
 				chosenWeaponIndex = selectIndex;
 		}
+
 		selectIndex++;
 	}
 	selectId = selectTab[chosenWeaponIndex].id;
@@ -918,9 +935,10 @@ bool Bot::KnifeAttack(float attackDistance)
 
 	if (kaMode > 0)
 	{
-		float distanceSkipZ = (pev->origin - GetEntityOrigin(entity)).GetLengthSquared2D();
+		Vector entityOrigin = GetEntityOrigin(entity);
+		float distanceSkipZ = (pev->origin - entityOrigin).GetLengthSquared2D();
 
-		if (pev->origin.z > GetEntityOrigin(entity).z && distanceSkipZ < SquaredF(64.0f))
+		if (pev->origin.z > entityOrigin.z && distanceSkipZ < SquaredF(64.0f))
 		{
 			pev->button |= IN_DUCK;
 			m_campButtons |= IN_DUCK;
@@ -931,7 +949,7 @@ bool Bot::KnifeAttack(float attackDistance)
 			pev->button &= ~IN_DUCK;
 			m_campButtons &= ~IN_DUCK;
 
-			if (pev->origin.z + 150.0f < GetEntityOrigin(entity).z && distanceSkipZ < SquaredF(300.0f))
+			if (pev->origin.z + 150.0f < entityOrigin.z && distanceSkipZ < SquaredF(300.0f))
 				pev->button |= IN_JUMP;
 		}
 
@@ -992,7 +1010,7 @@ void Bot::FocusEnemy(void)
 	if (m_enemySurpriseTime > engine->GetTime())
 		return;
 
-	float distance = (m_lookAt - EyePosition()).GetLengthSquared2D();  // how far away is the enemy scum?
+	float distance = (m_lookAt - EyePosition()).GetLengthSquared();  // how far away is the enemy scum?
 
 	if (distance < SquaredF(128.0f))
 	{

source/control.cpp

@@ -265,13 +265,10 @@ Bot* BotControl::FindOneValidAliveBot(void)
 {
 	Array <int> foundBots;
 
-	for (const auto& client : g_clients)
+	for (const auto& bot : m_bots)
 	{
-		if (client.index < 0)
-			continue;
-
-		if (m_bots[client.index] != nullptr && m_bots[client.index]->m_isAlive)
-			foundBots.Push(client.index);
+		if (bot != nullptr && bot->m_isAlive)
+			foundBots.Push(bot->m_index);
 	}
 
 	if (!foundBots.IsEmpty())
@@ -307,7 +304,7 @@ void BotControl::DoJoinQuitStuff(void)
 	if (min > max)
 		max = min * 1.5f;
 
-	m_randomJoinTime = AddTime(RANDOM_FLOAT(min, max));
+	m_randomJoinTime = AddTime(engine->RandomFloat(min, max));
 }
 
 void BotControl::Think(void)
@@ -863,7 +860,7 @@ Bot* BotControl::GetHighestSkillBot(int team)
 		{
 			if (highFragBot->m_skill > bestSkill)
 			{
-				bestIndex = bot->GetIndex();
+				bestIndex = bot->m_index;
 				bestSkill = highFragBot->m_skill;
 			}
 		}

source/interface.cpp

@@ -2800,21 +2800,21 @@ void SetPing(edict_t* to)
 		{
 			// start a new message
 			MESSAGE_BEGIN(MSG_ONE_UNRELIABLE, SVC_PINGS, nullptr, to);
-			WRITE_BYTE((bot->m_pingOffset[sending] * 64) + (1 + 2 * bot->GetIndex()));
+			WRITE_BYTE((bot->m_pingOffset[sending] * 64) + (1 + 2 * bot->m_index));
 			WRITE_SHORT(bot->m_ping[sending]);
 			sending++;
 		}
 		case 1:
 		{
 			// append additional data
-			WRITE_BYTE((bot->m_pingOffset[sending] * 128) + (2 + 4 * bot->GetIndex()));
+			WRITE_BYTE((bot->m_pingOffset[sending] * 128) + (2 + 4 * bot->m_index));
 			WRITE_SHORT(bot->m_ping[sending]);
 			sending++;
 		}
 		case 2:
 		{
 			// append additional data and end message
-			WRITE_BYTE(4 + 8 * bot->GetIndex());
+			WRITE_BYTE(4 + 8 * bot->m_index);
 			WRITE_SHORT(bot->m_ping[sending]);
 			WRITE_BYTE(0);
 			MESSAGE_END();