Add HL2MP bullet FX fixes for NPCs and other entities

Author: Blixibon

src/game/client/c_ai_basenpc.cpp

@@ -13,6 +13,7 @@
 #endif
 
 #ifdef MAPBASE_MP
+#include "takedamageinfo.h"
 #ifdef HL2MP
 #include "c_hl2mp_playerresource.h"
 #endif
@@ -25,6 +26,20 @@
 
 #define PING_MAX_TIME	2.0
 
+#ifdef MAPBASE_MP
+BEGIN_RECV_TABLE_NOBASE( C_AI_BaseNPC, DT_BaseNPCGameData )
+	RecvPropInt( RECVINFO( m_iHealth ) ),
+	RecvPropInt( RECVINFO( m_takedamage ) ),
+	RecvPropInt( RECVINFO( m_bloodColor ) ),
+	//RecvPropString( RECVINFO( m_szNetname ) ),	// Transmitted by player resource now
+	RecvPropInt( RECVINFO( m_nDefaultPlayerRelationship ) ),
+END_RECV_TABLE();
+#endif
+
+#ifdef CAI_BaseNPC
+#undef CAI_BaseNPC
+#endif
+
 IMPLEMENT_CLIENTCLASS_DT( C_AI_BaseNPC, DT_AI_BaseNPC, CAI_BaseNPC )
 	RecvPropInt( RECVINFO( m_lifeState ) ),
 	RecvPropBool( RECVINFO( m_bPerformAvoidance ) ),
@@ -37,6 +52,9 @@ IMPLEMENT_CLIENTCLASS_DT( C_AI_BaseNPC, DT_AI_BaseNPC, CAI_BaseNPC )
 	RecvPropInt( RECVINFO( m_bSpeedModActive ) ),
 	RecvPropBool( RECVINFO( m_bImportanRagdoll ) ),
 	RecvPropFloat( RECVINFO( m_flTimePingEffect ) ),
+#ifdef MAPBASE_MP
+	RecvPropDataTable( "npc_gamedata", 0, 0, &REFERENCE_RECV_TABLE( DT_BaseNPCGameData ) ),
+#endif
 END_RECV_TABLE()
 
 extern ConVar cl_npc_speedmod_intime;
@@ -53,6 +71,9 @@ bool NPC_IsImportantNPC( C_BaseAnimating *pAnimating )
 
 C_AI_BaseNPC::C_AI_BaseNPC()
 {
+#ifdef MAPBASE_MP
+	SetBloodColor( DONT_BLEED );
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -205,5 +226,89 @@ const char *C_AI_BaseNPC::GetPlayerName( void ) const
 
 	return BaseClass::GetPlayerName();
 }
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+void C_AI_BaseNPC::DispatchTraceAttack( const CTakeDamageInfo &info, const Vector &vecDir, trace_t *ptr, CDmgAccumulator *pAccumulator )
+{
+	m_fNoDamageDecal = false;
+
+	if ( info.GetAttacker() && info.GetAttacker()->IsPlayer() )
+	{
+		if ( IsPlayerAlly( ToBasePlayer( info.GetAttacker() ) ) )
+		{
+			m_fNoDamageDecal = true;
+			return;
+		}
+	}
+
+	BaseClass::DispatchTraceAttack( info, vecDir, ptr, pAccumulator );
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+void C_AI_BaseNPC::DecalTrace( trace_t *pTrace, char const *decalName )
+{
+	if ( m_fNoDamageDecal )
+	{
+		// Don't do impact decals when we shouldn't
+		// (adapts an existing hack from singleplayer HL2, see serverside counterpart)
+		m_fNoDamageDecal = false;
+		return;
+	}
+	BaseClass::DecalTrace( pTrace, decalName );
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+void C_AI_BaseNPC::ImpactTrace( trace_t *pTrace, int iDamageType, const char *pCustomImpactName )
+{
+	if ( m_fNoDamageDecal )
+	{
+		// Don't do impact decals when we shouldn't
+		// (adapts an existing hack from singleplayer HL2, see serverside counterpart)
+		m_fNoDamageDecal = false;
+		return;
+	}
+	BaseClass::ImpactTrace( pTrace, iDamageType, pCustomImpactName );
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+bool C_AI_BaseNPC::IsPlayerAlly( C_BasePlayer *pPlayer )											
+{ 
+	if ( pPlayer == NULL )
+	{
+		pPlayer = C_BasePlayer::GetLocalPlayer();
+	}
+
+	if ( pPlayer->GetTeamNumber() == TEAM_UNASSIGNED )
+	{
+		// AI relationship code isn't available here, so we currently transmit a var from the server to determine if we're, at least generically, an ally
+		return (m_nDefaultPlayerRelationship == GR_TEAMMATE);
+	}
+	else if (GetTeamNumber() == pPlayer->GetTeamNumber())
+	{
+		// Same team probably means allies
+		return true;
+	}
+
+	return false;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+bool C_AI_BaseNPC::IsNeutralTo( C_BasePlayer *pPlayer )
+{
+	if ( IsPlayerAlly( pPlayer ) )
+		return false;
+
+	return (m_nDefaultPlayerRelationship == GR_NOTTEAMMATE);
+}
 #endif
 

src/game/client/c_ai_basenpc.h

@@ -13,6 +13,9 @@
 
 
 #include "c_basecombatcharacter.h"
+#ifdef MAPBASE_MP
+#include "ai_debug_shared.h"
+#endif
 
 // NOTE: Moved all controller code into c_basestudiomodel
 class C_AI_BaseNPC : public C_BaseCombatCharacter
@@ -42,7 +45,14 @@ class C_AI_BaseNPC : public C_BaseCombatCharacter
 	bool					ImportantRagdoll( void ) { return m_bImportanRagdoll;	}
 
 #ifdef MAPBASE_MP
+	virtual int				GetHealth() const { return m_iHealth; }
+
 	virtual const char		*GetPlayerName( void ) const;
+	virtual void		DispatchTraceAttack( const CTakeDamageInfo &info, const Vector &vecDir, trace_t *ptr, CDmgAccumulator *pAccumulator = NULL );
+	void				DecalTrace( trace_t *pTrace, char const *decalName );
+	void				ImpactTrace( trace_t *pTrace, int iDamageType, const char *pCustomImpactName );
+	virtual bool		IsPlayerAlly( C_BasePlayer *pPlayer = NULL );
+	virtual bool		IsNeutralTo( C_BasePlayer *pPlayer = NULL );
 #endif
 
 private:
@@ -59,6 +69,19 @@ class C_AI_BaseNPC : public C_BaseCombatCharacter
 	bool m_bFadeCorpse;
 	bool m_bSpeedModActive;
 	bool m_bImportanRagdoll;
+
+#ifdef MAPBASE_MP
+	// User-friendly name used for death notices, etc.
+	// Now transmitted by player resource
+	//char m_szNetname[32];
+	
+	// Used to determine whether to draw blood, target ID, etc. on the client
+	// Uses first 3 gamerules relationship return codes (GR_TEAMMATE, GR_NOTTEAMMATE, and GR_ENEMY)
+	int m_nDefaultPlayerRelationship;
+
+	// Based on the existing decal hack from singleplayer HL2
+	bool m_fNoDamageDecal;
+#endif
 };
 
 

src/game/server/ai_basenpc.cpp

@@ -4641,6 +4641,23 @@ void CAI_BaseNPC::NPCThink( void )
 #ifdef MAPBASE_MP
 				if (bInPVS)
 				{
+					// Recalculate player relationship for client
+					CBasePlayer *pPlayer = UTIL_GetNearestPlayer( GetAbsOrigin() );
+					if (pPlayer)
+					{
+						Disposition_t nDisposition = pPlayer->IRelationType( this );
+						switch (nDisposition)
+						{
+							case D_LI:		m_nDefaultPlayerRelationship = GR_TEAMMATE; break;
+							case D_FR:
+							case D_HT:		m_nDefaultPlayerRelationship = GR_ENEMY; break;
+							default:
+							case D_NU:		m_nDefaultPlayerRelationship = GR_NOTTEAMMATE; break;
+						}
+					}
+					else
+						m_nDefaultPlayerRelationship = GR_NOTTEAMMATE; // Neutral
+
 #ifdef HL2MP
 					// Make sure the player resource has us listed if we just entered PVS
 					if (g_HL2MP_PR->GetNPCIndex( entindex() ) == -1)
@@ -12857,6 +12874,33 @@ BEGIN_SIMPLE_DATADESC( AIScheduleState_t )
 END_DATADESC()
 
 
+#ifdef MAPBASE_MP
+void *SendProxy_SendBaseNPCGameDataTable( const SendProp *pProp, const void *pStruct, const void *pVarData, CSendProxyRecipients *pRecipients, int objectID )
+{
+	// Only send if we can reasonably expect to be a "participant" in the game
+	// Invisible NPCs are already EF_NODRAW, so this mainly denies generic_actor, npc_furniture, etc.
+	CAI_BaseNPC *pNPC = ( CAI_BaseNPC * )pStruct;
+	if ( pNPC != NULL )
+	{
+		Class_T nClass = pNPC->Classify();
+		if (nClass == CLASS_NONE)
+		{
+			return NULL;
+		}
+	}
+	return (void *)pVarData;
+}
+REGISTER_SEND_PROXY_NON_MODIFIED_POINTER( SendProxy_SendBaseNPCGameDataTable );
+
+BEGIN_SEND_TABLE_NOBASE( CAI_BaseNPC, DT_BaseNPCGameData )
+	SendPropInt( SENDINFO( m_iHealth ), -1, SPROP_VARINT | SPROP_CHANGES_OFTEN ),
+	SendPropInt( SENDINFO( m_takedamage ), 2, SPROP_UNSIGNED ),
+	SendPropInt( SENDINFO( m_bloodColor ), 3, SPROP_UNSIGNED ),
+	//SendPropString( SENDINFO( m_szNetname ) ),	// Transmitted by player resource now
+	SendPropInt( SENDINFO( m_nDefaultPlayerRelationship ), 2, SPROP_UNSIGNED ),
+END_SEND_TABLE();
+#endif
+
 IMPLEMENT_SERVERCLASS_ST( CAI_BaseNPC, DT_AI_BaseNPC )
 	SendPropInt( SENDINFO( m_lifeState ), 3, SPROP_UNSIGNED ),
 	SendPropBool( SENDINFO( m_bPerformAvoidance ) ),
@@ -12869,6 +12913,9 @@ IMPLEMENT_SERVERCLASS_ST( CAI_BaseNPC, DT_AI_BaseNPC )
 	SendPropInt( SENDINFO( m_iSpeedModSpeed ) ),
 	SendPropBool( SENDINFO( m_bImportanRagdoll ) ),
 	SendPropFloat( SENDINFO( m_flTimePingEffect ) ),
+#ifdef MAPBASE_MP
+	SendPropDataTable( "npc_gamedata", 0, &REFERENCE_SEND_TABLE( DT_BaseNPCGameData ), SendProxy_SendBaseNPCGameDataTable ),
+#endif
 END_SEND_TABLE()
 
 //-------------------------------------

src/game/server/ai_basenpc.h

@@ -2189,6 +2189,14 @@ class CAI_BaseNPC : public CBaseCombatCharacter,
 
 	IMPLEMENT_NETWORK_VAR_FOR_DERIVED( m_lifeState );
 #ifdef MAPBASE_MP
+	IMPLEMENT_NETWORK_VAR_FOR_DERIVED( m_iHealth );
+	IMPLEMENT_NETWORK_VAR_FOR_DERIVED( m_takedamage );
+	IMPLEMENT_NETWORK_VAR_FOR_DERIVED( m_bloodColor );
+
+	// Used to determine whether to draw blood, target ID, etc. on the client
+	// Uses first 3 gamerules relationship return codes (GR_TEAMMATE, GR_NOTTEAMMATE, and GR_ENEMY)
+	CNetworkVar( int, m_nDefaultPlayerRelationship );
+
 	// User-friendly name used for death notices, etc.
 	// Now transmitted by player resource
 	//CNetworkString( m_szNetname, 32 );

src/game/server/basecombatcharacter.h

@@ -595,7 +595,11 @@ class CBaseCombatCharacter : public CBaseFlex
 	void				DestroyGlowEffect( void );
 
 protected:
+#ifdef MAPBASE_MP
+	CNetworkVarForDerived( int, m_bloodColor );
+#else
 	int			m_bloodColor;			// color of blood particless
+#endif
 
 	// -------------------
 	// combat ability data

src/game/server/hl2/npc_turret_floor.cpp

@@ -370,6 +370,10 @@ void CNPC_FloorTurret::Spawn( void )
 	CreateVPhysics();
 
 	SetState(NPC_STATE_IDLE);
+
+#ifdef MAPBASE_MP
+	SetBloodColor( DONT_BLEED );
+#endif
 }
 
 //-----------------------------------------------------------------------------

src/game/server/hl2/npc_turret_ground.cpp

@@ -150,6 +150,10 @@ void CNPC_GroundTurret::Spawn( void )
 
 	GetAttachment( "light", vecPos );
 	m_vecLightOffset = vecPos - GetAbsOrigin();
+
+#ifdef MAPBASE_MP
+	SetBloodColor( DONT_BLEED );
+#endif
 }
 
 //-----------------------------------------------------------------------------

src/game/shared/baseentity_shared.cpp

@@ -85,6 +85,12 @@ ConVar	ai_debug_shoot_positions( "ai_debug_shoot_positions", "0", FCVAR_REPLICAT
 
 #if defined(MAPBASE) && defined(GAME_DLL)
 ConVar	ai_shot_notify_targets( "ai_shot_notify_targets", "0", FCVAR_NONE, "Allows fired bullets to notify the NPCs and players they are targeting, regardless of whether they hit them or not. Can be used for custom AI and speech." );
+
+#if defined(MAPBASE_MP) && defined(HL2MP)
+ConVar	mp_use_server_bulletfx( "mp_use_server_bulletfx", "2", FCVAR_NONE, "Whether or not to use serverside bullet FX in multiplayer.\n"
+	"The default for HL2:DM is 0, but this causes issues with entities that don't transfer their damage filters or blood color to the client, such as NPCs.\n"
+	"While 1 universally re-enables serverside bullet FX, 2 only uses serverside bullet FX for non-players." );
+#endif
 #endif
 
 // Utility func to throttle rate at which the "reasonable position" spew goes out
@@ -1643,8 +1649,24 @@ void CBaseEntity::FireBullets( const FireBulletsInfo_t &info )
 	bool bDoServerEffects = true;
 
 #if defined( HL2MP ) && defined( GAME_DLL )
+#ifdef MAPBASE_MP
+	switch (mp_use_server_bulletfx.GetInt())
+	{
+		case 0:
+		default:
+			bDoServerEffects = false;
+			break;
+		case 1:
+			bDoServerEffects = true;
+			break;
+		case 2:
+			bDoServerEffects = !IsPlayer();
+			break;
+	}
+#else
 	bDoServerEffects = false;
 #endif
+#endif
 
 #if defined( GAME_DLL )
 	if( IsPlayer() )