Add HL2MP player collision avoidance + ally blood decal fix

Author: Blixibon

src/game/client/hl2mp/c_hl2mp_player.cpp

@@ -992,6 +992,22 @@ IRagdoll* C_HL2MP_Player::GetRepresentativeRagdoll() const
 	}
 }
 
+#ifdef MAPBASE
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+void C_HL2MP_Player::DispatchTraceAttack( const CTakeDamageInfo &info, const Vector &vecDir, trace_t *ptr, CDmgAccumulator *pAccumulator )
+{
+	if ( info.GetAttacker() )
+	{
+		if ( !friendlyfire.GetInt() && HL2MPRules()->PlayerRelationship( this, info.GetAttacker() ) == GR_TEAMMATE )
+			return;
+	}
+
+	BaseClass::DispatchTraceAttack( info, vecDir, ptr, pAccumulator );
+}
+#endif
+
 //HL2MPRAGDOLL
 
 

src/game/client/hl2mp/c_hl2mp_player.h

@@ -100,6 +100,12 @@ class C_HL2MP_Player : public C_BaseHLPlayer
 	bool SuitPower_RemoveDevice( const CSuitPowerDevice& device );
 	bool SuitPower_ShouldRecharge( void );
 	float SuitPower_GetCurrentPercentage( void ) { return m_HL2Local.m_flSuitPower; }
+
+#ifdef MAPBASE
+	virtual void	DispatchTraceAttack( const CTakeDamageInfo &info, const Vector &vecDir, trace_t *ptr, CDmgAccumulator *pAccumulator = NULL );
+
+	virtual bool	ShouldCollide( int collisionGroup, int contentsMask ) const;
+#endif
 
 	bool	CanSprint( void );
 	void	StartSprinting( void );

src/game/server/hl2mp/hl2mp_player.h

@@ -116,6 +116,8 @@ class CHL2MP_Player : public CHL2_Player
 	int	  GetPlayerModelType( void ) { return m_iPlayerSoundType;	}
 
 #ifdef MAPBASE
+	virtual bool	ShouldCollide( int collisionGroup, int contentsMask ) const;
+
 	// TF2-style AFK checking
 	void				CheckForIdle( void );
 	void				ResetIdleCheck( void ) { m_flLastAction = gpGlobals->curtime; }

src/game/shared/hl2mp/hl2mp_gamerules.cpp

@@ -68,6 +68,7 @@ extern CBaseEntity	 *g_pLastRebelSpawn;
 
 #ifdef MAPBASE
 ConVar sv_hl2mp_npc_target_id( "sv_hl2mp_npc_target_id", "1", FCVAR_REPLICATED, "If enabled, NPCs will be identified when players look at them with their crosshairs." );
+ConVar hl2mp_avoidteammates( "hl2mp_avoidteammates", "1", FCVAR_REPLICATED, "If enabled, players on the same team will not collide with each other." );
 #endif
 
 

src/game/shared/hl2mp/hl2mp_player_shared.cpp

@@ -125,6 +125,38 @@ void CHL2MP_Player::PlayStepSound( Vector &vecOrigin, surfacedata_t *psurface, f
 	EmitSound( filter, entindex(), ep );
 }
 
+#ifdef MAPBASE
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : collisionGroup - 
+// Output : Returns true on success, false on failure.
+//-----------------------------------------------------------------------------
+bool CHL2MP_Player::ShouldCollide( int collisionGroup, int contentsMask ) const
+{
+	extern ConVar hl2mp_avoidteammates;
+	if ( ( collisionGroup == COLLISION_GROUP_PLAYER || collisionGroup == COLLISION_GROUP_PLAYER_MOVEMENT ) && hl2mp_avoidteammates.GetBool() )
+	{
+		// Co-op ignores all players
+		if ( HL2MPRules() && HL2MPRules()->IsCoOp() )
+			return false;
+
+		switch( GetTeamNumber() )
+		{
+		case TEAM_REBELS:
+			if ( ( contentsMask & CONTENTS_TEAM1 ) )
+				return false;
+			break;
+
+		case TEAM_COMBINE:
+			if ( ( contentsMask & CONTENTS_TEAM2 ) )
+				return false;
+			break;
+		}
+	}
+	return BaseClass::ShouldCollide( collisionGroup, contentsMask );
+}
+#endif
+
 
 //==========================
 // ANIMATION CODE

src/game/shared/hl2mp/weapon_hl2mpbasebasebludgeon.cpp

@@ -220,6 +220,12 @@ void CBaseHL2MPBludgeonWeapon::Hit( trace_t &traceHit, Activity nHitActivity )
 
 		if ( this->PlayFleshyHittySoundOnHit() )
 			WeaponSound( MELEE_HIT );
+
+#ifdef MAPBASE_MP
+		// Don't do impact effect if this is an ally
+		if ( pHitEntity->MyNPCPointer() && pHitEntity->MyNPCPointer()->IsPlayerAlly( pPlayer ) )
+			return;
+#endif
 	}
 
 	// Apply an impact effect