diff options
Diffstat (limited to 'mp/src/game/shared/teamplay_gamerules.cpp')
| -rw-r--r-- | mp/src/game/shared/teamplay_gamerules.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mp/src/game/shared/teamplay_gamerules.cpp b/mp/src/game/shared/teamplay_gamerules.cpp index 1cbe368a..171313b3 100644 --- a/mp/src/game/shared/teamplay_gamerules.cpp +++ b/mp/src/game/shared/teamplay_gamerules.cpp @@ -352,9 +352,9 @@ bool CTeamplayRules::IsTeamplay( void ) return true; } -bool CTeamplayRules::FPlayerCanTakeDamage( CBasePlayer *pPlayer, CBaseEntity *pAttacker ) +bool CTeamplayRules::FPlayerCanTakeDamage( CBasePlayer *pPlayer, CBaseEntity *pAttacker, const CTakeDamageInfo &info ) { - if ( pAttacker && PlayerRelationship( pPlayer, pAttacker ) == GR_TEAMMATE ) + if ( pAttacker && PlayerRelationship( pPlayer, pAttacker ) == GR_TEAMMATE && !info.IsForceFriendlyFire() ) { // my teammate hit me. if ( (friendlyfire.GetInt() == 0) && (pAttacker != pPlayer) ) @@ -364,7 +364,7 @@ bool CTeamplayRules::FPlayerCanTakeDamage( CBasePlayer *pPlayer, CBaseEntity *pA } } - return BaseClass::FPlayerCanTakeDamage( pPlayer, pAttacker ); + return BaseClass::FPlayerCanTakeDamage( pPlayer, pAttacker, info ); } //========================================================= |