From 4601a9c318fde95b174ddd002103abfcb4cc700a Mon Sep 17 00:00:00 2001 From: fgsfds Date: Wed, 15 May 2024 13:39:12 +0200 Subject: [PATCH] port: only respect friendly fire setting in team games --- src/game/chraction.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/game/chraction.c b/src/game/chraction.c index 8ff7b6502..6e1daaa8f 100644 --- a/src/game/chraction.c +++ b/src/game/chraction.c @@ -4340,8 +4340,9 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse } #ifndef PLATFORM_N64 - // Don't damage if multiplayer and friendly fire is off + // Don't damage if team multiplayer and friendly fire is off if (g_Vars.mplayerisrunning + && (g_MpSetup.options & MPOPTION_TEAMSENABLED) && !(g_MpSetup.options & MPOPTION_FRIENDLYFIRE) && aprop && aprop != vprop