This is a fork of Zandronum Beta for TSPG.
Revision | 73e154db9c3cedfd74b4dfdc80487adf4066911a (tree) |
---|---|
Time | 2021-11-18 01:23:03 |
Author | Adam Kaminski <kaminskiadam9@gmai...> |
Commiter | Adam Kaminski |
"sv_shootthroughallies" and "sv_dontpushallies" now also apply to friendly actors.
@@ -3480,9 +3480,9 @@ | ||
3480 | 3480 | // [AK] One of the actors must be a player, at least. |
3481 | 3481 | if (( pActor1 && pActor2 ) && ( pActor1->player || pActor2->player )) |
3482 | 3482 | { |
3483 | - // [AK] Make sure the other actor is a teammate of the first actor. Otherwise, | |
3484 | - // their attacks should still hit and push each other. | |
3485 | - if (( pActor1 != pActor2 ) && ( pActor1->IsTeammate( pActor2 ))) | |
3483 | + // [AK] Make sure the other actor is a teammate or friend of the first actor. | |
3484 | + // Otherwise, their attacks should still hit and push each other. | |
3485 | + if (( pActor1 != pActor2 ) && ( pActor1->IsTeammate( pActor2 ) || pActor1->IsFriend( pActor2 ))) | |
3486 | 3486 | return true; |
3487 | 3487 | } |
3488 | 3488 |