[TF2] Allow damaging taunts to respect friendly fire rules#1843
Open
Professor-Heavy wants to merge 1 commit intoValveSoftware:masterfrom
Open
[TF2] Allow damaging taunts to respect friendly fire rules#1843Professor-Heavy wants to merge 1 commit intoValveSoftware:masterfrom
Professor-Heavy wants to merge 1 commit intoValveSoftware:masterfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This aims to consolidate damaging taunts under friendly fire rules (
mp_friendlyfire 1). Some taunts allow for friendly fire damage as they leave those checks toCTeamplayRules::FPlayerCanTakeDamageto decide, which performs the check asTakeDamageis being run. This explicitly removes the "same team" checks from the others, instead allowing the damage to be aborted during the appropriate checks rather than just refusing to check in the first place.There are some wherein the ConVar checks are performed during the taunt attack code instead, just to prevent any side effects (Armageddon taunt taking additional targets into account for damage when friendly fire is off, stunning taunts, etc).
Relates to issue ValveSoftware/Source-1-Games#7903
The following are affected by this: