Bots only attack breakable objects

Vaqtincha · Jun 8, 2021 · 64df2f9 · 64df2f9
1 parent 2c52c4f
commit 64df2f9
Showing 1 changed file with 22 additions and 16 deletions.
diff --git a/regamedll/dlls/bot/cs_bot.cpp b/regamedll/dlls/bot/cs_bot.cpp
@@ -295,27 +295,33 @@ void CCSBot::BotTouch(CBaseEntity *pOther)
 	// See if it's breakable
 	if (FClassnameIs(pOther->pev, "func_breakable"))
 	{
-		Vector center = (pOther->pev->absmax + pOther->pev->absmin) / 2.0f;
-		bool breakIt = true;
-
-		if (m_pathLength)
-		{
-			Vector goal = m_goalPosition + Vector(0, 0, HalfHumanHeight);
-			breakIt = IsIntersectingBox(pev->origin, goal, pOther->pev->absmin, pOther->pev->absmax);
-		}
-
-		if (breakIt)
+#ifdef REGAMEDLL_FIXES
+		// Is breakable ? spawnflags has SF_BREAK_TRIGGER_ONLY or material type matUnbreakableGlass
+		if (pOther->pev->takedamage != DAMAGE_NO || !(pOther->pev->flags |= FL_WORLDBRUSH))
+#endif
 		{
-			// it's breakable - try to shoot it.
-			SetLookAt("Breakable", &center, PRIORITY_HIGH, 0.2, 0, 5.0);
+			Vector center = (pOther->pev->absmax + pOther->pev->absmin) / 2.0f;
+			bool breakIt = true;
 
-			if (IsUsingGrenade())
+			if (m_pathLength)
 			{
-				EquipBestWeapon();
-				return;
+				Vector goal = m_goalPosition + Vector(0, 0, HalfHumanHeight);
+				breakIt = IsIntersectingBox(pev->origin, goal, pOther->pev->absmin, pOther->pev->absmax);
 			}
 
-			PrimaryAttack();
+			if (breakIt)
+			{
+				// it's breakable - try to shoot it.
+				SetLookAt("Breakable", &center, PRIORITY_HIGH, 0.2, 0, 5.0);
+
+				if (IsUsingGrenade())
+				{
+					EquipBestWeapon();
+					return;
+				}
+
+				PrimaryAttack();
+			}
 		}
 	}
 }