Merge branch 'port' into port-net

src/game/chraction.c

@@ -4388,6 +4388,18 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse
 		return;
 	}
 
+#ifndef PLATFORM_N64
+	// Don't damage if multiplayer and friendly fire is off
+	if (g_Vars.mplayerisrunning
+			&& !(g_MpSetup.options & MPOPTION_FRIENDLYFIRE)
+			&& aprop
+			&& aprop != vprop
+			&& (aprop->type == PROPTYPE_PLAYER || aprop->type == PROPTYPE_CHR)
+			&& chr->team == aprop->chr->team) {
+		return;
+	}
+#endif
+
 	if (gset == NULL) {
 		gset = &gset2;
 	}

src/game/mplayer/mplayer.c

@@ -572,6 +572,10 @@ void mpInit(void)
 		| MPOPTION_PAC_HIGHLIGHTTARGET
 		| MPOPTION_PAC_SHOWONRADAR;
 
+#ifndef PLATFORM_N64
+	g_MpSetup.options |= MPOPTION_FRIENDLYFIRE;
+#endif
+
 	g_Vars.mphilltime = 10;
 
 	func0f187fec();

src/game/mplayer/scenarios/capturethecase.inc

@@ -77,6 +77,14 @@ struct menuitem g_CtcOptionsMenuItems[] = {
 		MPOPTION_NODRUGBLUR,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR,
+		L_OPTIONS_257, // "Friendly Fire"
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_CHECKBOX,

src/game/mplayer/scenarios/combat.inc

@@ -72,6 +72,14 @@ struct menuitem g_MpCombatOptionsMenuItems[] = {
 		MPOPTION_NODRUGBLUR,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR,
+		L_OPTIONS_257, // "Friendly Fire"
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_SEPARATOR,

src/game/mplayer/scenarios/hackthatmac.inc

@@ -75,6 +75,14 @@ struct menuitem g_HtmOptionsMenuItems[] = {
 		MPOPTION_NODRUGBLUR,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR,
+		L_OPTIONS_257, // "Friendly Fire"
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_CHECKBOX,

src/game/mplayer/scenarios/holdthebriefcase.inc

@@ -75,6 +75,14 @@ struct menuitem g_HtbOptionsMenuItems[] = {
 		MPOPTION_NODRUGBLUR,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR,
+		L_OPTIONS_257, // "Friendly Fire"
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_CHECKBOX,

src/game/mplayer/scenarios/kingofthehill.inc

@@ -96,6 +96,14 @@ struct menuitem g_KohOptionsMenuItems[] = {
 		MPOPTION_NODRUGBLUR,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR,
+		L_OPTIONS_257, // "Friendly Fire"
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_CHECKBOX,

src/game/mplayer/scenarios/popacap.inc

@@ -73,6 +73,14 @@ struct menuitem g_PacOptionsMenuItems[] = {
 		MPOPTION_NODRUGBLUR,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR,
+		L_OPTIONS_257, // "Friendly Fire"
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_CHECKBOX,

src/include/constants.h

@@ -2918,6 +2918,7 @@
 #define MPOPTION_NODRUGBLUR             0x00400000
 #define MPOPTION_AUTORANDOMWEAPON_START 0x00800000
 #define MPOPTION_AUTORANDOMWEAPON_END   0x01000000
+#define MPOPTION_FRIENDLYFIRE           0x02000000
 
 #define MPPAUSEMODE_UNPAUSED 0
 #define MPPAUSEMODE_PAUSED   1