summaryrefslogtreecommitdiff
path: root/src/game/g_combat.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/g_combat.c')
-rw-r--r--src/game/g_combat.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 8b5877cf..80278f9a 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -1020,17 +1020,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
// check if friendly fire has been disabled
if( !g_friendlyFire.integer )
{
- if( !g_friendlyFireHumans.integer &&
- targ->client->ps.stats[ STAT_TEAM ] == TEAM_HUMANS )
- {
- return;
- }
-
- if( !g_friendlyFireAliens.integer &&
- targ->client->ps.stats[ STAT_TEAM ] == TEAM_ALIENS )
- {
- return;
- }
+ return;
}
}