Merge pull request #43 from wgetJane/melee-enemy-priority

prevent teammates from blocking melee attacks

Author: mastercoms

game/shared/tf/tf_weaponbase_melee.cpp

@@ -24,6 +24,7 @@
 #endif
 
 ConVar tf_weapon_criticals_melee( "tf_weapon_criticals_melee", "1", FCVAR_REPLICATED | FCVAR_NOTIFY, "Controls random crits for melee weapons. 0 - Melee weapons do not randomly crit. 1 - Melee weapons can randomly crit only if tf_weapon_criticals is also enabled. 2 - Melee weapons can always randomly crit regardless of the tf_weapon_criticals setting." );
+ConVar tf_melee_enemy_priority( "tf_melee_enemy_priority", "1", FCVAR_REPLICATED | FCVAR_NOTIFY, "Prevents teammates from blocking melee attacks." );
 
 //=============================================================================
 //
@@ -479,8 +480,6 @@ bool CTFWeaponBaseMelee::DoSwingTraceInternal( trace_t &trace, bool bCleave, CUt
 	}
 	else
 	{
-		bool bSapperHit = false;
-
 		// if this weapon can damage sappers, do that trace first
 		int iDmgSappers = 0;
 		CALL_ATTRIB_HOOK_INT( iDmgSappers, set_dmg_apply_to_sapper );
@@ -501,51 +500,52 @@ bool CTFWeaponBaseMelee::DoSwingTraceInternal( trace_t &trace, bool bCleave, CUt
 				CBaseObject *pObject = static_cast< CBaseObject* >( trace.m_pEnt );
 				if ( pObject->HasSapper() )
 				{
-					bSapperHit = true;
+					return true;
 				}
 			}
 		}
 
-		if ( !bSapperHit )
+		bool bEnemyPriority = tf_melee_enemy_priority.GetBool();
+		bool bHullTrace = false;
+
+		if ( bEnemyPriority || bDontHitTeammates )
 		{
-			// See if we hit anything.
-			if ( bDontHitTeammates )
-			{
-				UTIL_TraceLine( vecSwingStart, vecSwingEnd, MASK_SOLID, &ignoreTeammatesFilter, &trace );
-			}
-			else
+			bHullTrace = false;
+			UTIL_TraceLine( vecSwingStart, vecSwingEnd, MASK_SOLID, &ignoreTeammatesFilter, &trace );
+	
+			if ( trace.fraction >= 1.0 )
 			{
-				CTraceFilterIgnoreFriendlyCombatItems filter( pPlayer, COLLISION_GROUP_NONE, pPlayer->GetTeamNumber() );
-				UTIL_TraceLine( vecSwingStart, vecSwingEnd, MASK_SOLID, &filter, &trace );
+				bHullTrace = true;
+				UTIL_TraceHull( vecSwingStart, vecSwingEnd, vecSwingMins, vecSwingMaxs, MASK_SOLID, &ignoreTeammatesFilter, &trace );
 			}
+		}
+
+		if ( !bEnemyPriority || !bDontHitTeammates && ( trace.fraction >= 1.0 || !trace.m_pEnt->IsPlayer() ) )
+		{
+			bHullTrace = false;
+			CTraceFilterIgnoreFriendlyCombatItems filter( pPlayer, COLLISION_GROUP_NONE, pPlayer->GetTeamNumber() );
+			UTIL_TraceLine( vecSwingStart, vecSwingEnd, MASK_SOLID, &filter, &trace );
 
 			if ( trace.fraction >= 1.0 )
 			{
-				if ( bDontHitTeammates )
-				{
-					UTIL_TraceHull( vecSwingStart, vecSwingEnd, vecSwingMins, vecSwingMaxs, MASK_SOLID, &ignoreTeammatesFilter, &trace );
-				}
-				else
-				{
-					CTraceFilterIgnoreFriendlyCombatItems filter( pPlayer, COLLISION_GROUP_NONE, pPlayer->GetTeamNumber() );
-					UTIL_TraceHull( vecSwingStart, vecSwingEnd, vecSwingMins, vecSwingMaxs, MASK_SOLID, &filter, &trace );
-				}
-
-				if ( trace.fraction < 1.0 )
-				{
-					// Calculate the point of intersection of the line (or hull) and the object we hit
-					// This is and approximation of the "best" intersection
-					CBaseEntity *pHit = trace.m_pEnt;
-					if ( !pHit || pHit->IsBSPModel() )
-					{
-						// Why duck hull min/max?
-						FindHullIntersection( vecSwingStart, trace, VEC_DUCK_HULL_MIN, VEC_DUCK_HULL_MAX, pPlayer );
-					}
+				bHullTrace = true;
+				UTIL_TraceHull( vecSwingStart, vecSwingEnd, vecSwingMins, vecSwingMaxs, MASK_SOLID, &filter, &trace );
+			}
+		}
 
-					// This is the point on the actual surface (the hull could have hit space)
-					vecSwingEnd = trace.endpos;	
-				}
+		if ( bHullTrace && trace.fraction < 1.0 )
+		{
+			// Calculate the point of intersection of the line (or hull) and the object we hit
+			// This is and approximation of the "best" intersection
+			CBaseEntity *pHit = trace.m_pEnt;
+			if ( !pHit || pHit->IsBSPModel() )
+			{
+				// Why duck hull min/max?
+				FindHullIntersection( vecSwingStart, trace, VEC_DUCK_HULL_MIN, VEC_DUCK_HULL_MAX, pPlayer );
 			}
+
+			// This is the point on the actual surface (the hull could have hit space)
+			vecSwingEnd = trace.endpos;	
 		}
 
 		return ( trace.fraction < 1.0f );