Commit: 73e154db9c3cedfd74b4dfdc80487adf4066911a - zatspg-beta (hg)

This is a fork of Zandronum Beta for TSPG.

Commit MetaInfo

• Revision: 73e154db9c3cedfd74b4dfdc80487adf4066911a (tree)
• Time: 2021-11-18 01:23:03
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

"sv_shootthroughallies" and "sv_dontpushallies" now also apply to friendly actors.

Change Summary

• modified: src/p_interaction.cpp

Incremental Difference

diff -r bcc88ca3cbcc -r 73e154db9c3c src/p_interaction.cpp
--- a/src/p_interaction.cpp	Wed Nov 17 10:14:36 2021 +1100
+++ b/src/p_interaction.cpp	Wed Nov 17 11:23:03 2021 -0500
@@ -3480,9 +3480,9 @@
 	// [AK] One of the actors must be a player, at least.
 	if (( pActor1 && pActor2 ) && ( pActor1->player || pActor2->player ))
 	{
-		// [AK] Make sure the other actor is a teammate of the first actor. Otherwise,
-		// their attacks should still hit and push each other.
-		if (( pActor1 != pActor2 ) && ( pActor1->IsTeammate( pActor2 )))
+		// [AK] Make sure the other actor is a teammate or friend of the first actor.
+		// Otherwise, their attacks should still hit and push each other.
+		if (( pActor1 != pActor2 ) && ( pActor1->IsTeammate( pActor2 ) || pActor1->IsFriend( pActor2 )))
 			return true;
 	}