allow bots to be able to use zombie model

Author: Bitl

src/game/client/tf/c_tf_player.h

@@ -130,6 +130,11 @@ class C_TFPlayer : public C_BasePlayer, public IHasAttributes, public IInventory
 #ifdef BDSBASE
 	virtual void PlayStepSound(Vector& vecOrigin, surfacedata_t* psurface, float fvol, bool force);
 	virtual bool IsServerUsingTheFunnyMVMCvar(void);
+	virtual bool DoesServerWantBrainz(void);
+private:
+	bool		 BotModelChangeCheckInternal(void);
+
+public:
 #endif
 
 	CNewParticleEffect *SpawnHalloweenSpellFootsteps( ParticleAttachment_t eParticleAttachment, int iHalloweenFootstepType );

src/game/server/tf/bot/tf_bot.cpp

@@ -1568,10 +1568,11 @@ void CTFBot::HandleCommand_JoinClass(const char* pClassName, bool bAllowSpawn)
 
 	if (TFGameRules() && !TFGameRules()->IsMannVsMachineMode())
 	{
+		int nClassIndex = (GetPlayerClass() ? GetPlayerClass()->GetClassIndex() : TF_CLASS_UNDEFINED);
+
 		if (IsServerUsingTheFunnyMVMCvar())
 		{
 			// use the nifty new robot model
-			int nClassIndex = (GetPlayerClass() ? GetPlayerClass()->GetClassIndex() : TF_CLASS_UNDEFINED);
 			if (nClassIndex >= TF_CLASS_SCOUT && nClassIndex <= TF_CLASS_ENGINEER)
 			{
 				if (g_pFullFileSystem->FileExists(g_szBotModels[nClassIndex]))
@@ -1582,11 +1583,29 @@ void CTFBot::HandleCommand_JoinClass(const char* pClassName, bool bAllowSpawn)
 				}
 			}
 		}
+		else if (DoesServerWantBrainz())
+		{
+			//set to old model if needed
+			if (GetPlayerClass()->HasCustomModel())
+			{
+				GetPlayerClass()->SetCustomModel(NULL);
+				UpdateModel();
+				SetBloodColor(BLOOD_COLOR_RED);
+			}
+
+			// zombies use the original player models
+			m_nSkin = 4;
+			const char* name = g_aRawPlayerClassNamesShort[nClassIndex];
+			AddItem(CFmtStr("Zombie %s", name));
+		}
 		else
 		{
-			GetPlayerClass()->SetCustomModel(NULL);
-			UpdateModel();
-			SetBloodColor(BLOOD_COLOR_RED);
+			if (GetPlayerClass()->HasCustomModel())
+			{
+				GetPlayerClass()->SetCustomModel(NULL);
+				UpdateModel();
+				SetBloodColor(BLOOD_COLOR_RED);
+			}
 		}
 	}
 }

src/game/server/tf/player_vs_environment/tf_mann_vs_machine_logic.cpp

@@ -82,7 +82,7 @@ void CMannVsMachineLogic::Update( void )
 	}
 
 #ifdef BDSBASE
-	tf_bot_force_robot_models.SetValue(0);
+	tf_bot_models_override.SetValue(0);
 #endif
 
 	// we don't need to run this check as often as we're calling our update() function

src/game/server/tf/tf_player.h

@@ -196,7 +196,13 @@ class CTFPlayer : public CBaseMultiplayerPlayer, public IHasAttributes, public I
 	virtual void		CommitSuicide( bool bExplode = false, bool bForce = false );
 #ifdef BDSBASE
 	virtual void		CommitSuicideWithCustomRagdoll(int m_iCustomRagdoll = 0);
+
 	virtual bool		IsServerUsingTheFunnyMVMCvar(void);
+	virtual bool		DoesServerWantBrainz(void);
+private:
+	bool				BotModelChangeCheckInternal(void);
+
+public:
 #endif
 
 	// Combats

src/game/shared/tf/tf_gamerules.cpp

@@ -728,7 +728,7 @@ ConVar tf_spawn_glows_duration( "tf_spawn_glows_duration", "10", FCVAR_NOTIFY |
 #ifdef BDSBASE
 ConVar tf_allow_pyroland("tf_allow_pyroland", "0", FCVAR_REPLICATED | FCVAR_NOTIFY, "Enable Pyroland filters on the current map.");
 ConVar tf_killeater_demoshield_countotherkills("tf_killeater_demoshield_countotherkills", "0", FCVAR_REPLICATED | FCVAR_NOTIFY, "Allows Strange Demoman shields to count kills from other weapons.");
-ConVar tf_bot_force_robot_models("tf_bot_force_robot_models", "0", FCVAR_REPLICATED | FCVAR_NOTIFY, "");
+ConVar tf_bot_models_override("tf_bot_models_override", "0", FCVAR_REPLICATED | FCVAR_NOTIFY, "1 = MvM, 2 = zombie");
 #endif
 
 #if defined(QUIVER_DLL)

src/game/shared/tf/tf_gamerules.h

@@ -100,7 +100,14 @@ extern ConVar tf_mvm_defenders_team_size;
 #ifdef BDSBASE
 extern ConVar tf_mvm_max_invaders;
 extern ConVar tf_mvm_disguise_on_backstab_mode;
-extern ConVar tf_bot_force_robot_models;
+
+enum BotModelTypes_t
+{
+	MODEL_MVM = 1,
+	MODEL_ZOMBIE
+};
+
+extern ConVar tf_bot_models_override;
 #endif
 
 const int kLadder_TeamSize_6v6 = 6;

src/game/shared/tf/tf_player_shared.cpp

@@ -13252,9 +13252,19 @@ void CTFPlayer::PlayStepSound(Vector& vecOrigin, surfacedata_t* psurface, float
 	BaseClass::PlayStepSound(vecOrigin, psurface, fvol, force);
 }
 
+bool CTFPlayer::BotModelChangeCheckInternal(void)
+{
+	return (TFGameRules() && !TFGameRules()->IsMannVsMachineMode() && m_bIsABot);
+}
+
 bool CTFPlayer::IsServerUsingTheFunnyMVMCvar(void)
 { 
-	return (TFGameRules() && !TFGameRules()->IsMannVsMachineMode() && m_bIsABot && tf_bot_force_robot_models.GetBool()); 
+	return (BotModelChangeCheckInternal() && tf_bot_models_override.GetInt() == MODEL_MVM);
+}
+
+bool CTFPlayer::DoesServerWantBrainz(void)
+{
+	return (BotModelChangeCheckInternal() && tf_bot_models_override.GetInt() == MODEL_ZOMBIE);
 }
 #endif