Version 1.51-beta7 released!

Author: APGRoboCop

README.md

@@ -5,16 +5,17 @@ RCbot created by Cheeseh
 Supported Mods
 --------------
 
+- Action Half-Life (WIP)
 - Bumpercars
 - Battlegrounds
 - Deathmatch Classic
-- Opposing Force (CTF)
+- Opposing Force
 - Natural Selection
 - Rocket Crowbar
-- Front Line Force
-- Science and Industry
+- Front Line Force (WIP)
+- Science and Industry (WIP)
 - The Specialists
-- Wizard Wars
+- Wizard Wars (WIP)
 
 RCBot versions
 --------------
@@ -29,6 +30,7 @@ V 1.51-beta7
 * added: C++17 Standard library support 
 * added: Strafing combat to evade from being easy target bots
 * added: Linux bot slow-motion fix by w00tguy
+* added: Team DeathMatch mode supported for HLDM, Op4DM, DMC and TS
 
 * changed: Increased the bot's flexibility
 * changed: Avoid using welder in NS Combat
@@ -47,7 +49,6 @@ V 1.51-beta7
 * TODO: To allow the Onos to be more aggressive and devour humans
 * TODO: To allow bots to use first aid mounted on the wall or `func_healthcharger`
 * TODO: To improve on how to allow bots climb ladders more properly
-* TODO: To prevent bots from team shooting in Team Deathmatch mode for HLDM, Op4DM, DMC and TS
 * TODO: To prevent bots in TS v3.0 on firing empty rounds and lying proning on floors
 * TODO: To allow bots in Op4 to use Grapple by using the "Fly" waypoint
 * TODO: To add proper support for S&I, AHL, FLF and WizWars

dlls/bot.cpp

@@ -2586,7 +2586,7 @@ void CBot::StartGame()
 
 		break;
 	case MOD_GEARBOX: // Support for OP4CTF [APG]RoboCop[CL]
-		
+
 		if (std::strncmp("op4ctf_", STRING(gpGlobals->mapname), 7) == 0 ||
 			std::strncmp("op4cp_", STRING(gpGlobals->mapname), 6) == 0)
 		{
@@ -9492,7 +9492,12 @@ BOOL CBot::IsEnemy(edict_t* pEntity)
 		break;*/
 	case MOD_GEARBOX:
 	{
-		//gBotGlobals.m_bTeamPlay = true; //Required to prevent team shooting in Op4CTF? [APG]RoboCop[CL]
+		const char* szClassname = const_cast<char*>(STRING(pEntity->v.classname));
+
+		if (std::strcmp(szClassname, "func_breakable") == 0)
+		{
+			return BotFunc_BreakableIsEnemy(pEntity, m_pEdict);
+		}
 
 		if (!EntityIsAlive(pEntity))
 			return false;
@@ -9503,8 +9508,6 @@ BOOL CBot::IsEnemy(edict_t* pEntity)
 				std::strncmp("op4cp_", STRING(gpGlobals->mapname), 6) == 0))
 		{
 			// code from Sandbot by tschumann
-			const char* szClassname = const_cast<char*>(STRING(pEntity->v.classname));
-
 			//char* infobuffer = GET_INFOKEYBUFFER(pEntity);
 			//std::strcpy(szClassname, INFOKEY_VALUE(infobuffer, "model"));
 
@@ -9521,7 +9524,7 @@ BOOL CBot::IsEnemy(edict_t* pEntity)
 			// different teams are enemies
 			return pEntity->v.flags & FL_CLIENT && GetTeam() != UTIL_GetTeam(pEntity);
 		}
-		else
+		else if (pEntity->v.flags & FL_CLIENT)  // different model for team play
 		{
 			char* infobuffer1 = (*g_engfuncs.pfnGetInfoKeyBuffer)(m_pEdict);
 			char* infobuffer2 = (*g_engfuncs.pfnGetInfoKeyBuffer)(pEntity);