• R/O
  • SSH

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-c誰得cocoaqtpythonrubywindowsphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

This is a fork of Zandronum Beta for TSPG.


Commit MetaInfo

Revision73e154db9c3cedfd74b4dfdc80487adf4066911a (tree)
Time2021-11-18 01:23:03
AuthorAdam Kaminski <kaminskiadam9@gmai...>
CommiterAdam Kaminski

Log Message

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

Change Summary

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 @@
34803480 // [AK] One of the actors must be a player, at least.
34813481 if (( pActor1 && pActor2 ) && ( pActor1->player || pActor2->player ))
34823482 {
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 )))
34863486 return true;
34873487 }
34883488