Add automatic protagonist support to HL2MP player

Author: Blixibon

src/game/server/hl2/hl2_player.cpp

@@ -4604,6 +4604,15 @@ void CHL2_Player::SetProtagonist( const char *pszProtagonist )
 		return;
 	}
 
+#ifdef HL2MP
+	int nTeam = g_ProtagonistSystem.GetProtagonist_Team( nIndex );
+	if (nTeam != GetTeamNumber() && GetTeamNumber() != TEAM_UNASSIGNED && nTeam != TEAM_ANY)
+	{
+		// Not an acceptable team
+		return;
+	}
+#endif
+
 	if (m_nProtagonistIndex != -1)
 	{
 		// Flush any pre-existing data

src/game/server/hl2mp/hl2mp_player.cpp

@@ -42,6 +42,10 @@ ConVar hl2mp_spawn_frag_fallback_radius( "hl2mp_spawn_frag_fallback_radius", "48
 
 #define HL2MP_COMMAND_MAX_RATE 0.3
 
+#ifdef MAPBASE
+ConVar	sv_hl2mp_protagonist_select( "sv_hl2mp_protagonist_select", "0", FCVAR_NONE, "Allows players to select any valid protagonist, rather than being limited to default HL2:DM models." );
+#endif
+
 void DropPrimedFragGrenade( CHL2MP_Player *pPlayer, CBaseCombatWeapon *pGrenade );
 
 LINK_ENTITY_TO_CLASS( player, CHL2MP_Player );
@@ -403,6 +407,23 @@ void CHL2MP_Player::Spawn(void)
 
 bool CHL2MP_Player::ValidatePlayerModel( const char *pModel )
 {
+#ifdef MAPBASE
+	if (pModel[0] == '#')
+	{
+		if (!sv_hl2mp_protagonist_select.GetBool())
+		{
+			ClientPrint( this, HUD_PRINTTALK, "Server does not allow direct protagonist selection" );
+			return false;
+		}
+
+		int nProtagonist = g_ProtagonistSystem.FindProtagonistIndex( pModel + 1 );
+		if (nProtagonist != -1)
+		{
+			return true;
+		}
+	}
+#endif
+
 	int iModels = ARRAYSIZE( g_ppszRandomCitizenModels );
 	int i;	
 
@@ -444,7 +465,11 @@ void CHL2MP_Player::SetPlayerTeamModel( void )
 
 	int modelIndex = modelinfo->GetModelIndex( szModelName );
 
+#ifdef MAPBASE
+	if ( (modelIndex == -1 && szModelName[0] != '#') || ValidatePlayerModel(szModelName) == false)
+#else
 	if ( modelIndex == -1 || ValidatePlayerModel( szModelName ) == false )
+#endif
 	{
 		szModelName = "models/Combine_Soldier.mdl";
 		m_iModelType = TEAM_COMBINE;
@@ -479,8 +504,34 @@ void CHL2MP_Player::SetPlayerTeamModel( void )
 
 		m_iModelType = TEAM_REBELS;
 	}
-	
+
+#ifdef MAPBASE
+	if ( szModelName[0] == '#' )
+	{
+		// Protagonist name. Was already validated above
+		SetProtagonist( szModelName + 1 );
+	}
+	else
+	{
+		// Find out if we have a protagonist for this model
+		const char *pszProtagonistName = g_ProtagonistSystem.FindProtagonistByModel( szModelName );
+		if (pszProtagonistName)
+		{
+			SetProtagonist( pszProtagonistName );
+
+			// Fall back if not accepted
+			if ( GetProtagonistIndex() == -1 )
+				SetModel( szModelName );
+		}
+		else
+		{
+			SetModel( szModelName );
+		}
+	}
+#else
 	SetModel( szModelName );
+#endif
+
 	SetupPlayerSoundsByModel( szModelName );
 
 	m_flNextModelChangeTime = gpGlobals->curtime + MODEL_CHANGE_INTERVAL;
@@ -543,6 +594,18 @@ void CHL2MP_Player::SetPlayerModel( void )
 		}
 	}
 
+#ifdef MAPBASE
+	if (szModelName[0] == '#')
+	{
+		// Protagonist name. Was already validated above
+		SetProtagonist( szModelName + 1 );
+	}
+	else
+	{
+		ResetProtagonist();
+	}
+#endif
+
 	int modelIndex = modelinfo->GetModelIndex( szModelName );
 
 	if ( modelIndex == -1 )
@@ -556,7 +619,28 @@ void CHL2MP_Player::SetPlayerModel( void )
 		engine->ClientCommand ( edict(), szReturnString );
 	}
 
+#ifdef MAPBASE
+	if (GetProtagonistIndex() == -1)
+	{
+		// Find out if we have a protagonist for this model
+		const char *pszProtagonistName = g_ProtagonistSystem.FindProtagonistByModel( szModelName );
+		if (pszProtagonistName)
+		{
+			SetProtagonist( pszProtagonistName );
+
+			// Fall back if not accepted
+			if ( GetProtagonistIndex() <= -1 )
+				SetModel( szModelName );
+		}
+		else
+		{
+			SetModel( szModelName );
+		}
+	}
+#else
 	SetModel( szModelName );
+#endif
+
 	SetupPlayerSoundsByModel( szModelName );
 
 	m_flNextModelChangeTime = gpGlobals->curtime + MODEL_CHANGE_INTERVAL;

src/game/shared/hl2mp/hl2mp_gamerules.cpp

@@ -35,6 +35,7 @@
 	#include "hl2mp_cvars.h"
 #ifdef MAPBASE
 	#include "bot/hl2mp_bot_manager.h"
+	#include "mapbase/protagonist_system.h"
 #endif
 
 extern void respawn(CBaseEntity *pEdict, bool fCopyCorpse);
@@ -878,6 +879,26 @@ void CHL2MPRules::ClientSettingsChanged( CBasePlayer *pPlayer )
 		}
 		else
 		{
+#ifdef MAPBASE
+			if (szModelName[0] == '#')
+			{
+				int nProtagonist = g_ProtagonistSystem.FindProtagonistIndex( szModelName + 1 );
+				if (nProtagonist != -1)
+				{
+					int nTeam = g_ProtagonistSystem.GetProtagonist_Team( nProtagonist );
+					if ( nTeam == TEAM_REBELS )
+					{
+						pHL2Player->ChangeTeam( TEAM_REBELS );
+					}
+					else if ( nTeam == TEAM_COMBINE )
+					{
+						pHL2Player->ChangeTeam( TEAM_COMBINE );
+					}
+				}
+			}
+			else
+#endif
+
 			if ( Q_stristr( szModelName, "models/human") )
 			{
 				pHL2Player->ChangeTeam( TEAM_REBELS );