TDM Team Shoot partially repaired

Author: APGRoboCop

README.md

@@ -19,7 +19,7 @@ Supported Mods
 RCBot versions
 --------------
 
-V 1.51-beta6
+V 1.51-beta7
 ---------
 
 * added: Enhanced performance and stability
@@ -49,7 +49,6 @@ V 1.51-beta6
 * 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 bring back the TS v3.0 stunt dive code that was working previously
 * 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/basemonster.h

@@ -783,7 +783,7 @@ class CBaseMonster : public CBaseToggle
 	virtual BOOL FInViewCone(Vector* pOrigin);// see if given location is in monster's view cone
 	void TraceAttack(entvars_t* pevAttacker, float flDamage, Vector vecDir, TraceResult* ptr, int bitsDamageType) override;
 	void MakeDamageBloodDecal(int cCount, float flNoise, TraceResult* ptr, const Vector& vecDir);
-	virtual BOOL	IsAlive() override { return pev->deadflag != DEAD_DEAD; }
+	BOOL IsAlive() override { return pev->deadflag != DEAD_DEAD; }
 };
 
 #endif

dlls/bits.h

@@ -79,9 +79,9 @@ class CBits
 	int size() const;
 
 private:
-	int m_iNumBits;
+	unsigned int m_iNumBits;
 	unsigned char* m_cBits;
-	int m_iSize; // bits' mem size
+	//int m_iSize; // bits' mem size
 };
 
 #endif

dlls/bot.cpp

@@ -8412,8 +8412,8 @@ void CBot::WorkMoveDirection()
 
 	// botmans code! (me maths suxorz...sorta)
 	const float radians = fAngle * static_cast<float>(M_PI) / 180.0f; // degrees to radians
-	float flMove = std::cos(radians);
-	float flSide = std::sin(radians);
+	const float flMove = std::cos(radians);
+	const float flSide = std::sin(radians);
 	//
 
 	/* // <-- add extra slash to uncomment this code
@@ -16374,7 +16374,7 @@ if ( !HasUser4Mask(MASK_UPGRADE_9) )
 	}
 }
 
-BOOL CBot::CanFly()
+BOOL CBot::CanFly() const
 {
 	return IsLerk() || (IsMarine() && HasJetPack())
 		|| ((gBotGlobals.IsMod(MOD_GEARBOX) && HasWeapon(static_cast<int>(GearboxWeapon::GRAPPLE)))

dlls/bot.h

@@ -372,7 +372,7 @@ class CBotReputations
 
 	CClient* GetRandomClient(int iRep) const;
 
-	void WriteToFile(int iBotProfile, CBotReputation* pRep);
+	static void WriteToFile(int iBotProfile, CBotReputation* pRep);
 
 	void RemoveSaveRep(int iBotProfile, int iPlayerRepId);
 
@@ -3079,7 +3079,7 @@ class CBot
 
 	edict_t* getSentry() const;
 
-	BOOL CanBuild(edict_t* pEdict, int* metal = nullptr);
+	static BOOL CanBuild(edict_t* pEdict, int* metal = nullptr);
 
 	const char* getLookTaskDescription() const
 	{
@@ -3123,7 +3123,7 @@ class CBot
 	CPerceptron* dec_stunt;
 	edict_t* m_pElectricEnemy;
 
-	BOOL isInAnimate(edict_t* pEntity);
+	static BOOL isInAnimate(edict_t* pEntity);
 
 	BOOL isFriendly(edict_t* pEntity) const;
 
@@ -3895,7 +3895,7 @@ class CBot
 	// that the bot doesn't want to avoid.
 	BOOL CanAvoid(edict_t* pEntity, float fDistanceToEntity, float fAvoidDistance) const;
 
-	void ChangeAngles(float* fSpeed, float* fIdeal, float* fCurrent, float* fUpdate);
+	static void ChangeAngles(float* fSpeed, float* fIdeal, float* fCurrent, float* fUpdate);
 
 	BOOL IsOnLadder() const
 	{
@@ -3908,7 +3908,7 @@ class CBot
 	}
 
 	// if bot can fly, this will return true
-	BOOL CanFly();
+	BOOL CanFly() const;
 	/*{
 		return IsMarine() && HasJetPack() || IsLerk();
 	}*/
@@ -4704,7 +4704,7 @@ class CClients
 
 	void ClientDisconnected(edict_t* pPlayer);
 
-	void ClientDisconnected(CClient* pClient);
+	static void ClientDisconnected(CClient* pClient);
 
 	CClient* GetClientByIndex(int iIndex)
 	{
@@ -5572,7 +5572,7 @@ class CBotCam
 
 	BOOL TuneIn(edict_t* pPlayer) const;
 
-	void TuneOff(edict_t* pPlayer);
+	static void TuneOff(edict_t* pPlayer);
 
 	BOOL IsWorking() const;
 
@@ -5782,7 +5782,7 @@ class CTFCFlags
 		m_Flags.Pop();
 	}
 
-	edict_t* getFlag(int team, int active_goal)
+	static edict_t* getFlag(int team, int active_goal)
 	{
 		return nullptr;
 	}

dlls/bot_ga.cpp

@@ -72,7 +72,7 @@ void CBotGAValues::crossOver(IIndividual* other)
 
 	CBotGAValues* vother = static_cast<CBotGAValues*>(other);
 
-	int i;
+	unsigned int i;
 
 	for (i = 0; i < iPoint; i++)
 	{
@@ -298,7 +298,7 @@ void CBitsGAValues::crossOver(IIndividual* other)
 // mutate some values
 void CBitsGAValues::mutate()
 {
-	for (int i = 0; i < m_theBits->numBits(); i++)
+	for (unsigned int i = 0; i < m_theBits->numBits(); i++)
 	{
 		if (RANDOM_FLOAT(0.0f, 1.0f) < CGA::g_fMutateRate)
 		{

dlls/bot_nn.cpp

@@ -63,17 +63,17 @@ NN::NN(int iNumHiddenLayers, int iNumInputs, int iNumNeuronsPerHiddenLayer, int
 	m_Layers.emplace_back(new NNLayer(iNumOutputs, iNumNeuronsPerHiddenLayer));
 }
 
-void NN::setWeights(std::vector<ga_value>* weights) const
+void NN::setWeights(const std::vector<ga_value>* weights) const
 {
-	unsigned short int w = 0;
+	unsigned int w = 0;
 
 	for (const NNLayer* l : m_Layers)
 	{
-		for (unsigned short int j = 0; j < l->numNeurons(); j++)
+		for (unsigned int j = 0; j < l->numNeurons(); j++)
 		{
 			CPerceptron* n = l->getNeuron(j);
 
-			for (unsigned short int k = 0; k < n->numWeights(); k++)
+			for (unsigned int k = 0; k < n->numWeights(); k++)
 			{
 				n->setWeight(k, (*weights)[w++]);
 			}
@@ -85,25 +85,25 @@ void NN::getWeights(std::vector<ga_value>* weights) const
 {
 	for (const NNLayer* l : m_Layers)
 	{
-		for (unsigned short int j = 0; j < l->numNeurons(); j++)
+		for (unsigned int j = 0; j < l->numNeurons(); j++)
 		{
 			const CPerceptron* n = l->getNeuron(j);
 
-			for (unsigned short int k = 0; k < n->numWeights(); k++)
+			for (unsigned int k = 0; k < n->numWeights(); k++)
 			{
 				weights->emplace_back(n->getWeight(k));
 			}
 		}
 	}
 }
 
-void NN::trainOutputs(std::vector<ga_value>* wanted_outputs) const
+void NN::trainOutputs(const std::vector<ga_value>* wanted_outputs) const
 {
-	unsigned short int w = 0;
+	unsigned int w = 0;
 
 	for (const NNLayer* l : m_Layers)
 	{
-		for (unsigned short int j = 0; j < l->numNeurons(); j++)
+		for (unsigned int j = 0; j < l->numNeurons(); j++)
 		{
 			CPerceptron* n = l->getNeuron(j);
 
@@ -120,7 +120,7 @@ void NN::getOutputs(std::vector<ga_value>* outputs) const
 
 	for (const NNLayer* l : m_Layers)
 	{
-		for (unsigned short int j = 0; j < l->numNeurons(); j++)
+		for (unsigned int j = 0; j < l->numNeurons(); j++)
 		{
 			const CPerceptron* n = l->getNeuron(j);
 
@@ -131,7 +131,7 @@ void NN::getOutputs(std::vector<ga_value>* outputs) const
 
 void NN::execute(std::vector <ga_value>* outputs, std::vector <ga_value>* inputs) const
 {
-	unsigned short int i;
+	unsigned int i;
 
 	std::vector<ga_value> newoutputs;
 
@@ -146,7 +146,7 @@ void NN::execute(std::vector <ga_value>* outputs, std::vector <ga_value>* inputs
 
 		newoutputs.clear();
 
-		for (unsigned short int j = 0; j < l->numNeurons(); j++)
+		for (unsigned int j = 0; j < l->numNeurons(); j++)
 		{
 			CPerceptron* n = l->getNeuron(j);
 
@@ -158,8 +158,8 @@ void NN::execute(std::vector <ga_value>* outputs, std::vector <ga_value>* inputs
 
 		outputs->clear();
 
-		for (unsigned int k = 0; k < newoutputs.size(); k++)
-			outputs->emplace_back(newoutputs[k]);
+		for (float& newoutput : newoutputs)
+			outputs->emplace_back(newoutput);
 	}
 }
 
@@ -243,7 +243,7 @@ void NN::randomize() const
 {
 	for (const NNLayer* l : m_Layers)
 	{
-		for (unsigned short int j = 0; j < l->numNeurons(); j++)
+		for (unsigned int j = 0; j < l->numNeurons(); j++)
 		{
 			l->getNeuron(j)->randomize();
 		}
@@ -256,7 +256,7 @@ void NN::freeMemory()
 	{
 		NNLayer* l = m_Layer;
 
-		for (unsigned short int j = 0; j < l->numNeurons(); j++)
+		for (unsigned int j = 0; j < l->numNeurons(); j++)
 		{
 			l->freeMemory();
 		}

dlls/cbase.h

@@ -122,8 +122,8 @@ class CSquadMonster;
 class EHANDLE
 {
 private:
-	edict_t* m_pent;
-	int		m_serialnumber;
+	edict_t* m_pent = nullptr;
+	int		m_serialnumber = 0;
 public:
 	edict_t* Get();
 	edict_t* Set(edict_t* pent);
@@ -250,12 +250,12 @@ class CBaseEntity
 
 	virtual CBaseEntity* Respawn() { return nullptr; }
 
-	void SUB_UseTargets(CBaseEntity* pActivator, USE_TYPE useType, float value);
+	virtual void SUB_UseTargets(CBaseEntity* pActivator, USE_TYPE useType, float value);
 	// Do the bounding boxes of these two intersect?
 	int		Intersects(CBaseEntity* pOther);
 	void	MakeDormant();
 	int		IsDormant();
-	BOOL    IsLockedByMaster() { return false; }
+	static BOOL    IsLockedByMaster() { return false; }
 
 #ifdef _DEBUG
 	static CBaseEntity* Instance(edict_t* pent)
@@ -279,17 +279,16 @@ class CBaseEntity
 	static CBaseEntity* Instance(entvars_t* pev) { return Instance(ENT(pev)); }
 	static CBaseEntity* Instance(int eoffset) { return Instance(ENT(eoffset)); }
 
-	CBaseMonster* GetMonsterPointer(entvars_t* pevMonster)
+	static CBaseMonster* GetMonsterPointer(entvars_t* pevMonster)
 	{
-		CBaseEntity* pEntity = Instance(pevMonster);
-		if (pEntity)
+		if (CBaseEntity* pEntity = Instance(pevMonster))
 			return pEntity->MyMonsterPointer();
 		return nullptr;
 	}
-	CBaseMonster* GetMonsterPointer(edict_t* pentMonster)
+
+	static CBaseMonster* GetMonsterPointer(edict_t* pentMonster)
 	{
-		CBaseEntity* pEntity = Instance(pentMonster);
-		if (pEntity)
+		if (CBaseEntity* pEntity = Instance(pentMonster))
 			return pEntity->MyMonsterPointer();
 		return nullptr;
 	}
@@ -462,7 +461,7 @@ class CBaseDelay : public CBaseEntity
 
 	static	TYPEDESCRIPTION m_SaveData[];
 	// common member functions
-	void SUB_UseTargets(CBaseEntity* pActivator, USE_TYPE useType, float value);
+	void SUB_UseTargets(CBaseEntity* pActivator, USE_TYPE useType, float value) override;
 	void EXPORT DelayThink();
 };
 

dlls/dll.cpp

@@ -941,8 +941,7 @@ void ClientCommand(edict_t* pEntity)
 					}
 
 					// finished with message
-					std::free(szMessage);
-
+					delete[] szMessage;
 					szMessage = nullptr;
 				}
 			}
@@ -1766,7 +1765,7 @@ void BotFunc_ReadProfile(std::FILE* fp, bot_profile_t* bpBotProfile)
 {
 	char szBuffer[128];
 
-	int i;
+	unsigned int i;
 
 	char szTemp[64];
 	int j;
@@ -2012,7 +2011,7 @@ void ReadBotUsersConfig()
 			if (length == 0) // nothing on line
 				continue;
 
-			int i = 0;
+			unsigned int i = 0;
 
 			while (i < length && buffer[i] != '"')
 				i++;

dlls/globals.cpp

@@ -1164,7 +1164,7 @@ void CBotGlobals::MapInit()
 	m_fNextJoinTeam = 0.0f;
 	m_iNumBots = 0;
 
-	m_bTeamPlay = false;
+	m_bTeamPlay = true;
 
 	m_currCapPoint = nullptr;
 	m_currFlag = nullptr;
@@ -1224,14 +1224,21 @@ void CBotGlobals::MapInit()
 	}
 	else if (IsMod(MOD_GEARBOX))
 	{
-		if (std::strncmp(mapname, "op4ctf_", 3) == 0)
+		if (std::strncmp(mapname, "op4ctf_", 7) == 0 || std::strncmp(mapname, "op4cp_", 6) == 0)
 		{
 			setMapType(NON_TS_TEAMPLAY);
 			//TODO: To make sure that Op4DM mode doesn't play as CTF Mode [APG]RoboCop[CL]
 			// Op4CTF Support [APG]RoboCop[CL]
 			//extern edict_t *pent_info_ctfdetect;
 			m_bTeamPlay = true;
 		}
+		else
+		{
+			if (CVAR_GET_FLOAT("mp_teamplay") <= 0.0f)
+			{
+				m_bTeamPlay = false;
+			}
+		}
 	}
 
 	PRECACHE_MODEL("models/mechgibs.mdl");