Merge pull request #3 from BitlDevelopmentStudios/NPC

[HL2DM] NPC support for multiplayer

Author: Bitl

README.md

@@ -21,6 +21,7 @@ This base is specific to multiplayer mod projects.
 - Full support of the Half-Life 2 Survivor animation set for all mods.
 - reset.bat file in each mod folder, used for cleaning up config/temporary files for easy mod distribution
 - Implemented bhopping functionality that can be enabled or disabled by server owners in TF2 and HL2DM.
+- Multiplayer NPC support with the BDSBASE_NPC compile definition.
 
 ## Setup:
 Read Autumn's setup guide at README_FROG.md for detailed setup.

src/game/client/fx_blood.cpp

@@ -25,14 +25,6 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
-#ifdef BDSBASE
-#ifdef TF_CLIENT_DLL
-ConVar r_classic_blood("r_classic_blood", "0", FCVAR_DEVELOPMENTONLY);
-#else
-ConVar r_classic_blood("r_classic_blood", "0", FCVAR_ARCHIVE);
-#endif
-#endif
-
 CLIENTEFFECT_REGISTER_BEGIN( PrecacheEffectBloodSpray )
 CLIENTEFFECT_MATERIAL( "effects/blood_core" )
 CLIENTEFFECT_MATERIAL( "effects/blood_gore" )
@@ -510,24 +502,6 @@ DECLARE_CLIENT_EFFECT( "bloodspray", BloodSprayCallback );
 void BloodImpactCallback( const CEffectData & data )
 {
 	bool bFoundBlood = false;
-
-#ifdef BDSBASE
-	if (!r_classic_blood.GetBool())
-	{
-		// Find which sort of blood we are
-		for (int i = 0; i < ARRAYSIZE(bloodCallbacks); i++)
-		{
-			if (bloodCallbacks[i].nColor == data.m_nColor)
-			{
-				QAngle	vecAngles;
-				VectorAngles(-data.m_vNormal, vecAngles);
-				DispatchParticleEffect(bloodCallbacks[i].lpszParticleSystemName, data.m_vOrigin, vecAngles);
-				bFoundBlood = true;
-				break;
-			}
-		}
-	}
-#else
 	// Find which sort of blood we are
 	for (int i = 0; i < ARRAYSIZE(bloodCallbacks); i++)
 	{
@@ -540,7 +514,6 @@ void BloodImpactCallback( const CEffectData & data )
 			break;
 		}
 	}
-#endif
 
 	if ( bFoundBlood == false )
 	{

src/game/client/hl2/hud_locator.cpp

@@ -128,8 +128,10 @@ bool CHudLocator::ShouldDraw( void )
 	if( pPlayer->GetVehicle() )
 		return false;
 
+#ifdef HL2_EPISODIC
 	if( pPlayer->m_HL2Local.m_vecLocatorOrigin == vec3_invalid )
 		return false;
+#endif //HL2_EPISODIC
 
 	return true;
 }

src/game/client/weapon_selection.cpp

@@ -401,6 +401,7 @@ void CBaseHudWeaponSelection::UserCmd_Slot10(void)
 }
 
 #ifdef BDSBASE
+#ifdef HL2_CLIENT_DLL
 void ClientInstantPhysSwap()
 {
 	C_BasePlayer* pPlayer = C_BasePlayer::GetLocalPlayer();
@@ -433,6 +434,7 @@ void ClientInstantPhysSwap()
 
 static ConCommand cl_physswap("phys_swap", ClientInstantPhysSwap, "Client-predicted physcannon swap for low-latency switching.");
 #endif
+#endif
 
 //-----------------------------------------------------------------------------
 // Purpose: returns true if the CHudMenu should take slot1, etc commands

src/game/server/EntityDissolve.cpp

@@ -232,7 +232,11 @@ CEntityDissolve *CEntityDissolve::Create( CBaseEntity *pTarget, const char *pMat
 			// Necessary to cause it to do the appropriate death cleanup
 			if ( pTarget->m_lifeState == LIFE_ALIVE )
 			{
-				CBasePlayer *pPlayer = UTIL_PlayerByIndex( 1 );
+#ifdef BDSBASE_NPC
+				CBasePlayer* pPlayer = UTIL_GetLocalPlayer();
+#else
+				CBasePlayer* pPlayer = UTIL_PlayerByIndex(1);
+#endif //BDSBASE
 				CTakeDamageInfo ragdollInfo( pPlayer, pPlayer, 10000.0, DMG_SHOCK | DMG_REMOVENORAGDOLL | DMG_PREVENT_PHYSICS_FORCE );
 				pTarget->TakeDamage( ragdollInfo );
 			}
@@ -347,7 +351,11 @@ void CEntityDissolve::DissolveThink( void )
 		// Necessary to cause it to do the appropriate death cleanup
 		// Yeah, the player may have nothing to do with it, but
 		// passing NULL to TakeDamage causes bad things to happen
-		CBasePlayer *pPlayer = UTIL_PlayerByIndex( 1 );
+#ifdef BDSBASE_NPC
+		CBasePlayer* pPlayer = UTIL_GetNearestPlayer(GetAbsOrigin());
+#else
+		CBasePlayer* pPlayer = UTIL_PlayerByIndex(1);
+#endif //BDSBASE
 		int iNoPhysicsDamage = g_pGameRules->Damage_GetNoPhysicsForce();
 		CTakeDamageInfo info( pPlayer, pPlayer, 10000.0, DMG_GENERIC | DMG_REMOVENORAGDOLL | iNoPhysicsDamage );
 		pTarget->TakeDamage( info );

src/game/server/EnvHudHint.cpp

@@ -89,7 +89,11 @@ void CEnvHudHint::InputShowHudHint( inputdata_t &inputdata )
 		}
 		else
 		{
+#ifdef BDSBASE_NPC
+			pPlayer = UTIL_GetNearestPlayer(GetAbsOrigin());
+#else
 			pPlayer = UTIL_GetLocalPlayer();
+#endif //BDSBASE
 		}
 
 		if ( !pPlayer || !pPlayer->IsNetClient() )
@@ -126,7 +130,11 @@ void CEnvHudHint::InputHideHudHint( inputdata_t &inputdata )
 		}
 		else
 		{
+#ifdef BDSBASE_NPC
+			pPlayer = UTIL_GetNearestPlayer(GetAbsOrigin());
+#else
 			pPlayer = UTIL_GetLocalPlayer();
+#endif //BDSBASE
 		}
 
 		if ( !pPlayer || !pPlayer->IsNetClient() )

src/game/server/EnvMessage.cpp

@@ -105,7 +105,11 @@ void CMessage::InputShowMessage( inputdata_t &inputdata )
 		}
 		else
 		{
+#ifdef BDSBASE_NPC
+			pPlayer = UTIL_GetLocalPlayer(); // just show it to the host, if there is one 
+#else
 			pPlayer = (gpGlobals->maxClients > 1) ? NULL : UTIL_GetLocalPlayer();
+#endif //BDSBASE
 		}
 
 		if ( pPlayer && pPlayer->IsPlayer() )
@@ -219,12 +223,19 @@ void CCredits::RollOutroCredits()
 {
 	sv_unlockedchapters.SetValue( "15" );
 
-	CBasePlayer *pPlayer = UTIL_GetLocalPlayer();
-
-	CSingleUserRecipientFilter user( pPlayer );
+#ifdef BDSBASE_NPC
+	CRecipientFilter filter;
+	filter.AddAllPlayers();
+	filter.MakeReliable();
+	UserMessageBegin(filter, "CreditsMsg");
+#else
+	CBasePlayer* pPlayer = UTIL_GetLocalPlayer();
+
+	CSingleUserRecipientFilter user(pPlayer);
 	user.MakeReliable();
 
-	UserMessageBegin( user, "CreditsMsg" );
+	UserMessageBegin(user, "CreditsMsg");
+#endif //BDSBASE
 		WRITE_BYTE( 3 );
 	MessageEnd();
 }
@@ -241,20 +252,38 @@ void CCredits::InputRollOutroCredits( inputdata_t &inputdata )
 
 void CCredits::InputShowLogo( inputdata_t &inputdata )
 {
-	CBasePlayer *pPlayer = UTIL_GetLocalPlayer();
-
-	CSingleUserRecipientFilter user( pPlayer );
+#ifdef BDSBASE_NPC
+	CRecipientFilter filter;
+	filter.AddAllPlayers();
+	filter.MakeReliable();
+
+	// Modification. Set to how old patched AI SDK had code. 
+	//CSingleUserRecipientFilter user( pPlayer ); 
+	//user.MakeReliable(); 
+#else
+	CBasePlayer* pPlayer = UTIL_GetLocalPlayer();
+
+	CSingleUserRecipientFilter user(pPlayer);
 	user.MakeReliable();
+#endif //BDSBASE
 
 	if ( m_flLogoLength )
 	{
-		UserMessageBegin( user, "LogoTimeMsg" );
+#ifdef BDSBASE_NPC
+		UserMessageBegin(filter, "LogoTimeMsg");
+#else
+		UserMessageBegin(user, "LogoTimeMsg");
+#endif //BDSBASE
 			WRITE_FLOAT( m_flLogoLength );
 		MessageEnd();
 	}
 	else
 	{
-		UserMessageBegin( user, "CreditsMsg" );
+#ifdef BDSBASE_NPC
+		UserMessageBegin(filter, "CreditsMsg");
+#else
+		UserMessageBegin(user, "CreditsMsg");
+#endif //BDSBASE
 			WRITE_BYTE( 1 );
 		MessageEnd();
 	}
@@ -267,12 +296,21 @@ void CCredits::InputSetLogoLength( inputdata_t &inputdata )
 
 void CCredits::InputRollCredits( inputdata_t &inputdata )
 {
-	CBasePlayer *pPlayer = UTIL_GetLocalPlayer();
+#ifdef BDSBASE_NPC
+	CRecipientFilter filter;
+	filter.AddAllPlayers();
+	filter.MakeReliable();
+
+	UserMessageBegin(filter, "CreditsMsg");
+		WRITE_BYTE(2); // Modification: Added from old patched AI SDK. 
+#else
+	CBasePlayer* pPlayer = UTIL_GetLocalPlayer();
 
-	CSingleUserRecipientFilter user( pPlayer );
+	CSingleUserRecipientFilter user(pPlayer);
 	user.MakeReliable();
 
-	UserMessageBegin( user, "CreditsMsg" );
-		WRITE_BYTE( 2 );
+	UserMessageBegin(user, "CreditsMsg");
+		WRITE_BYTE(2);
+#endif //BDSBASE
 	MessageEnd();
 }