mirror of
https://github.com/perfect-dark-pc-port/perfect_dark.git
synced 2026-10-23 15:52:41 +02:00
port: only respect friendly fire setting in team games
This commit is contained in:
1 parent
5c7d4ecf52
commit
4601a9c318
1 file changed
+2
-1
@@ -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
|
||||
|
||||
Reference in new issue
Block a user